Bump to pacman-4.0.0. Add support for gpgme with help of buildsystem patch, support...
authorNathan Phillip Brink <binki@gentoo.org>
Tue, 18 Oct 2011 00:58:32 +0000 (00:58 +0000)
committerNathan Phillip Brink <binki@gentoo.org>
Tue, 18 Oct 2011 00:58:32 +0000 (00:58 +0000)
Package-Manager: portage-2.2.0_alpha67-r1/cvs/Linux x86_64

sys-apps/pacman/ChangeLog
sys-apps/pacman/Manifest
sys-apps/pacman/files/pacman-4.0.0-gpgme.patch [new file with mode: 0644]
sys-apps/pacman/metadata.xml
sys-apps/pacman/pacman-4.0.0.ebuild [new file with mode: 0644]

index b40606a3ee54cde37b7d49b36d9e8a409715618e..062aea10a06e49a3cf78b65b1179862aa1b3a512 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pacman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v 1.7 2011/10/16 23:02:15 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v 1.8 2011/10/18 00:58:32 binki Exp $
+
+*pacman-4.0.0 (18 Oct 2011)
+
+  18 Oct 2011; Nathan Phillip Brink <binki@gentoo.org> +pacman-4.0.0.ebuild,
+  +files/pacman-4.0.0-gpgme.patch, metadata.xml:
+  Bump to pacman-4.0.0. Add support for gpgme with help of buildsystem patch,
+  support new libcurl functionality, add missing asciidoc DEPEND, and install
+  bash completion files.
 
   16 Oct 2011; Nathan Phillip Brink <binki@gentoo.org> -pacman-3.4.1.ebuild,
   -pacman-3.5.2.ebuild:
index 0c9707bdb872510252a07ee102f8c2ab383b20a2..eb6f21056a03b4e7c3a3e3b918bad1d82fa130fe 100644 (file)
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pacman-4.0.0-gpgme.patch 1588 RMD160 8d2328303e784d6da38d0a184b6865a28bc58c0f SHA1 c793b5d29e7260767f8937526146993d464d8b1c SHA256 19e285aca79c1c0499a013eee30a22a9b16e6d8cd8c3583ffc8c597e39bbb2ed
 DIST pacman-3.5.4.tar.gz 1676599 RMD160 7845369a63240795d59a86186a7d04c4a3c24f4c SHA1 880e9db07edfad8032262e593fd7dc22a6d798fe SHA256 8dae177eaca66a521bbc2582a6919c9682e161b457871d03a340410d50fb7e45
+DIST pacman-4.0.0.tar.gz 1921691 RMD160 9f54817ba7141fb3f05f23a129aea7114308d0bf SHA1 097e4671ccf02d0995101798613b27de6b0f8866 SHA256 c83bbb8d386b492f9d00a6944c8bcaf84a4372a5f1111d3014638af02abed23e
 EBUILD pacman-3.5.4.ebuild 1470 RMD160 fe26c3b751bae77a5d665ac5bb2e49b36644f6bb SHA1 1b64a24fb4a666e5a6f1cb17a6fad186f4d69633 SHA256 a633fa29652da14f6fa7c3e3f871900a6da1001fb11d1589b277ffc2cda25ab0
-MISC ChangeLog 1418 RMD160 7320833d0c9863330baae9b5736b968f9602afb6 SHA1 dc9576cd876f4ada88cdd2c2a64f865ca9c31c9c SHA256 fee94560bda7f0620b9b46c84ebb058cef41103f08e7cc47973d2feb828d42d6
-MISC metadata.xml 244 RMD160 763839a53ccf1e2a58d249cfa2d94feeaa69e29c SHA1 fe85b5f10031620b8d1da84d695ec3080df29d82 SHA256 f5bde347c36c74889cbb32d29f06766c08eb3df6e0c468f00295681382c48457
+EBUILD pacman-4.0.0.ebuild 1884 RMD160 7116eb394506bf2e989efcf0659815fb4a3e6f8b SHA1 30e7989ae32ea6997dc8a40144c5d2a76ef9cf21 SHA256 db9fc5cf05df54ac3b95aab2f1fc64e79e2276c0cf92307f876f79ea4ee5827f
+MISC ChangeLog 1755 RMD160 68652a8704197f69ae96b2f7fdfaa65e614bdffd SHA1 a93ad161bdee3438e4d5b717de6a2b5f4f145d09 SHA256 ab7ba07c67bf711baa014fc9152aa4b732d51bf9c59c1b252dc4df8763b6256b
+MISC metadata.xml 365 RMD160 e70af71ae1ca20b37f824bbcbc84059f51708f68 SHA1 9b4244189e85668c1a4c4b11c372b83a38759c47 SHA256 9fc1ef7dbfcf2bf60550a9012a41fb77c8795d2af3cf59a4c6fd1f59169b2d1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOm2OPAAoJEHQ6UuhrqBBQ4foP/3ZcmYu7dQEYBgELpPekSPVk
-AK+aB8xX4eL+w3iW3JJg+lgL8XL4CTQ+12KrBMj8L5AYYij2H1lhuVAm3j8kZehB
-4QDqDGAeoUJgqyFia2TraI7qicla/tKQT/tQjoswHyCmw/TNLj7kyVtuvGD2H/Qs
-OThRzTmD1YmaBz66mArX1j0628+GcMzocNYyHdTbfJdkgoII9iuUkQgIhm/AxYdN
-/CvJEWFzDoNxA89Kp/VJ9jf9MdSnX11gYNR/IQki/kJg232pHdrb5xuCdX1f0hdG
-i06Xwnchjt6WFcD/T1hKdzUxjKKQ3wT0xEtC1N+hfKM1Xc2YKgG7Pj5cbRlwP3Jq
-q8rRfv45BjNF0VXxtU8QswIguPHbj90pYb1P12Ei1FXp2/DLnRR8zLtAJX9UT7Sb
-pXHif+xgGGY6iZPp6bpWyCd+OVi0/OueYrsyICB2BapKT5QOIWMUUbM9tzmp9mgn
-idOFTlRqUQRGTanvqO3gpAUgWh9yywodNs4szb52mJ7QElI/eEZCMU8iqxq1/oQI
-udzYK5f7rKzBl+/u/Zpxf9MelMKG3CZWG+6I4pBfrYxLckQ9k0xGwrtUxMTloTfP
-QEBsM3fBNXTOt/gVy2uE1JtrQbiIGGxKwx+gWj+2mNNkyMSEQqr/CYjYmmrvS2Wx
-jtJSl9C2SkOszFgh8njO
-=oj/N
+iQIcBAEBCAAGBQJOnNBlAAoJEHQ6UuhrqBBQjaMP/jDJrAvIKb749N0J96sr1DPk
+uy4n/z69HcKhITJ5baVlrXN8tu9a8Spj4fYoDOl1zPwPJp3NNR0O4hFwKd8EczRK
+iGVQXdvkWGmh5OF1uz2MtMUJhqj5r2VecInZfPtefutjGb1UYJ7gxQahjMWxWieJ
+1VbTalj3Khmpya0Vk+z7cNZPZK5FeH51Q2zslJh/j+dVxJhgmKNDFXrDuXq2RUYY
+U/OSC+ZrZ8gM8VqxgWJl/E2hq3RKuBCUvhGyi+9GOnhhmz7MqfK5eI1xejrrbnSR
+3bDn1t3xHRY/LKx5Uwf1SoUFIt49IlLZy3lEvIVcRv6ADCjWMOy/9TfdoHvomN4n
+aOZw/SdGbOODXXIfvrHM6ceFDK/bLehhrgcdqWAFjMl4SSCeg4zSEan45LZ0dlTy
+4ZyWgcH4aJQKuAVc8/PhscLWd2zzXSOks/cKxeDOSySQUtDl6N2n5gJY5K9TRiJn
+efBglfqqv/4RbE9UvavKwYQps1Qza4aC3zeYoj5rDEWCczjNi8fLTZgrk/K8Xbo1
+yo1RVTZyg0KqkmTJrQpsPAb30Pg+dz7F728POkbLzjeJwEjB7awuSHp8IAH+J/LW
+rOPlCuuCyhJGuh0Xs14kuS3TiDoeLrHAJnd3BbgqXT6F8MHbq51F3JahphJj8nJN
+Gzzfw0T4EcJjBdeOOzbK
+=4pM5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pacman/files/pacman-4.0.0-gpgme.patch b/sys-apps/pacman/files/pacman-4.0.0-gpgme.patch
new file mode 100644 (file)
index 0000000..ab0f57c
--- /dev/null
@@ -0,0 +1,45 @@
+From fc732def0944aac5c7b18860b4f46444e6d50044 Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: Mon, 17 Oct 2011 21:01:22 +0000
+Subject: [PATCH] Use AM_GPGME_PATH macro from gpgme instead of home-built gpgme detection.
+
+Fixes compilation on Gentoo, where CPPFLAGS=-I/usr/include/gpgme is
+necessary.
+---
+ configure.ac |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c23da75..87cd359 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -161,14 +161,18 @@ AM_CONDITIONAL([HAVE_LIBSSL], [test "x$with_openssl" = "xyes"])
+ # Check for gpgme
+ AC_MSG_CHECKING(whether to link with libgpgme)
+ AS_IF([test "x$with_gpgme" != "xno"],
+-      [AC_MSG_RESULT(yes)
+-      AC_CHECK_LIB([gpgme], [gpgme_check_version], ,
+-      [if test "x$with_gpgme" != "xcheck"; then
+-              AC_MSG_FAILURE([--with-ggpme was given, but -lgpgme was not found])
+-      fi],
+-      [-lgpgme])
+-      with_gpgme=$ac_cv_lib_gpgme_gpgme_check_version],
+-      AC_MSG_RESULT(no))
++      [AC_MSG_RESULT([yes])],
++      [AC_MSG_RESULT([no])])
++AS_IF([test "x$with_gpgme" != "xno"],
++      [AM_PATH_GPGME([],
++              [LIBS="$LIBS $GPGME_LIBS"
++              CPPFLAGS="$CPPFLAGS $GPGME_CPPFLAGS"
++              CFLAGS="$CFLAGS $GPGME_CFLAGS"
++              with_gpgme=yes
++              AC_DEFINE([HAVE_LIBGPGME], [1], [Define if gpgme should be used to provide GPG signature support.])],
++              [AS_IF([test "x$with_gpgme" != "xcheck"],
++                      [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])])
++              with_gpgme=no])])
+ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"])
+ # Checks for header files.
+-- 
+1.7.3.4
+
index 548448307c187ed79dbffc7a244d5b70c2357114..4581cf002bfb97f4850a56208ced074673e6a06f 100644 (file)
@@ -5,4 +5,7 @@
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
   </maintainer>
+  <use>
+    <flag name="gpg">Support verifying packages signed with GPG using <pkg>app-crypt/gpgme</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-apps/pacman/pacman-4.0.0.ebuild b/sys-apps/pacman/pacman-4.0.0.ebuild
new file mode 100644 (file)
index 0000000..7552b08
--- /dev/null
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-4.0.0.ebuild,v 1.1 2011/10/18 00:58:32 binki Exp $
+
+EAPI=4
+
+inherit autotools autotools-utils bash-completion-r1 eutils
+
+DESCRIPTION="Archlinux's binary package manager"
+HOMEPAGE="http://archlinux.org/pacman/"
+SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="curl debug doc gpg test"
+
+COMMON_DEPEND="app-arch/libarchive
+       dev-libs/openssl
+       virtual/libiconv
+       virtual/libintl
+       sys-devel/gettext
+       curl? ( net-misc/curl )
+       gpg? ( app-crypt/gpgme )"
+RDEPEND="${COMMON_DEPEND}
+       app-arch/xz-utils"
+# autoconf macros from gpgme requied unconditionally
+DEPEND="${COMMON_DEPEND}
+       app-crypt/gpgme
+       doc? ( app-doc/doxygen
+               app-text/asciidoc )
+       test? ( dev-lang/python )"
+
+RESTRICT="test"
+
+src_prepare() {
+       # Adds AM_GPGME_PATH call which requires app-crypt/gpgme to be
+       # DEPENDed on unconditionally:
+       epatch "${FILESDIR}"/${P}-gpgme.patch
+
+       # Remove a line that adds -Werror in ./configure when --enable-debug
+       # is passed:
+       sed -i -e '/-Werror/d' configure.ac || die "-Werror"
+       eautoreconf
+}
+
+src_configure() {
+       local myeconfargs=(
+               --localstatedir=/var
+               --disable-git-version
+               --with-openssl
+               # Help protect users from shooting their Gentoo installation in
+               # its foot.
+               --with-root-dir="${EPREFIX}"/var/chroot/archlinux
+               $(use_enable debug)
+               $(use_enable doc)
+               $(use_enable doc doxygen)
+               $(use_with curl libcurl)
+               $(use_with gpg gpgme)
+       )
+       autotools-utils_src_configure
+}
+
+src_install() {
+       autotools-utils_src_install
+
+       dodir /etc/pacman.d
+       newbashcomp "${AUTOTOOLS_BUILD_DIR}"/contrib/bash_completion pacman
+}
+
+pkg_postinst() {
+       einfo "Please see http://ohnopub.net/~ohnobinki/gentoo/arch/ for information"
+       einfo "about setting up an archlinux chroot."
+}