diff options
| -rw-r--r-- | app-crypt/gpgme/ChangeLog | 12 | ||||
| -rw-r--r-- | app-crypt/gpgme/Manifest | 20 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch | 22 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch | 11 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.1.5.ebuild | 44 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.1.7.ebuild | 42 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.1.8-r1.ebuild (renamed from app-crypt/gpgme/gpgme-1.1.8.ebuild) | 14 |
7 files changed, 31 insertions, 134 deletions
diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog index 5b8e772f3682..997877d57532 100644 --- a/app-crypt/gpgme/ChangeLog +++ b/app-crypt/gpgme/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-crypt/gpgme # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.153 2009/01/05 08:34:47 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.154 2009/03/07 23:50:42 dragonheart Exp $ + +*gpgme-1.1.8-r1 (07 Mar 2009) + + 07 Mar 2009; Daniel Black <dragonheart@gentoo.org> + -files/gpgme-1.1.7-_gpgme_cancel_with_err.patch, + +files/gpgme-1.1.8-et_EE.patch, -gpgme-1.1.5.ebuild, -gpgme-1.1.7.ebuild, + -gpgme-1.1.8.ebuild, +gpgme-1.1.8-r1.ebuild: + fix for bug #242332 gpgme-config script fails with et_EE locale. thanks step + for the report and Harald van Dijk for isolating the problem. Cleanout old + stuff too *gpgme-1.1.8 (03 Jan 2009) diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index 4dd71349e577..c8238b1c6824 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,25 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gpgme-1.1.6-cvs.patch 6683 RMD160 81247a6a691aac302d10c469805a4a1c15401739 SHA1 7f3a01a31c0708bd7df473173904f7bc47050897 SHA256 2a47856e3164ce107c7e6c7c8a835abf5864995d2f9ce8bc6d16f6c0fbff4ddd -AUX gpgme-1.1.7-_gpgme_cancel_with_err.patch 615 RMD160 e632f937a2d0d654f1c492387e1253154db515d1 SHA1 6cee716015905c9370c249d281649195db2d99f1 SHA256 811ae9967ac1e84434615f6160cca40e3bf7899df168d51dc50689faeaa9265e +AUX gpgme-1.1.8-et_EE.patch 356 RMD160 6ea6ff37a428ececc30e2535793a56540f3c4219 SHA1 6ecf74e97f14b39959f2952a26389977a1843b87 SHA256 dcf67057447f1f6316ebad2b61340bc24086eb470a9cb68cababcb709b329e7b AUX gpgme3.m4.patch 472 RMD160 7135d85d557f7e17c30d8956e3e9bb2ed6d3c235 SHA1 6773ab5656162215f0aca6160ca249ee0e36905b SHA256 db3f0150c46f526bc1e2c5c7a3ce517d9c567599d6c7d983c5c03957fc29afc3 DIST gpgme-0.3.14.tar.gz 655474 RMD160 96d1db35441611d0ddc3e2e8824e2b1d673b9837 SHA1 c97a4fdca455acc70c6b3a106da07389db4d50ed SHA256 4e822b5bb4f8d3269ab9d205e714ed9463b951c77e8ac0ffc0cf8ba7667bdc88 -DIST gpgme-1.1.5.tar.gz 929270 RMD160 54520e0bcacecc337e33b92e6dac6d1ced8a30af SHA1 428d0faee47509e69ce95620d5075579296cb884 SHA256 4ffb19d69b7cf9179252fa7f0a5f0db9064417024da260770d959dcf7bc3492a DIST gpgme-1.1.6.tar.gz 961286 RMD160 b761fed5ad88ef4b467c981bcc0ef95317c11ac1 SHA1 8dee551f362fc428c25c9bd542ce944ac916347d SHA256 7cf6cd9dfc1f02488eab8cb8a64d3904c71df9a04b1e9614beeec72dbde3f49f -DIST gpgme-1.1.7.tar.gz 1041253 RMD160 6c2f612b30d3fcb2a8e485b6a614622acd6b2c2a SHA1 88e461a570a8a10db26b20cd858932c91134af94 SHA256 597a5799d4cfa022acb8ef731177b29276480f8cad2e64cd0b3d161fd0c46e2f DIST gpgme-1.1.8.tar.gz 1085576 RMD160 6ee8856956cc8082fd19da457456b84d21d94841 SHA1 5f119d57009f1b8682d7665ae985325d0885ec9b SHA256 a7f276a6d21b9fef471a3c734d8be5a04ba8364a4d239e437aa137ce18b0afd8 EBUILD gpgme-0.3.14-r2.ebuild 2185 RMD160 362743b80a9e6b19fe7a376f6a6f0ca7160c5903 SHA1 7088827b0a1458558bc9390da7bee316be69b262 SHA256 50860499c21ea7abebd616d05588148b36c9f1352fe8049e862c112dd13f0e13 -EBUILD gpgme-1.1.5.ebuild 1100 RMD160 46d5bf59729e2e61c5f1b529384d4def34036d7f SHA1 8afba454be212ad404e1c4e763e46a9b91e7b35a SHA256 f73a3c61431f03b4d5b08c3fa363de84a0d867b92b95b8bec6669280bade8f38 EBUILD gpgme-1.1.6.ebuild 1168 RMD160 1edf8d7e91418bcb46cc720c3926481693c7d30c SHA1 302c8974010c72826a2c9b02616d8f20e34529a7 SHA256 318984d22f18cb6dc939a42fd3da46393ea63f9347fdf4d38d6415b2e65fdc4b -EBUILD gpgme-1.1.7.ebuild 1165 RMD160 e87668611b34ae671267fb796568020ad66f242a SHA1 c40269a1973c38cc0200e559abe71c9557e5f528 SHA256 48278c35ef39cbeafc3b308811f631c12b76d4e4d58fb4e0e6fed42278d094b0 -EBUILD gpgme-1.1.8.ebuild 1081 RMD160 cac5180c6007a6840535c57a182882d4fd27260d SHA1 6fea087abf802c1ee502bc433939116454a788ff SHA256 59b8b0c86e655e037ad60511923a7cc2d42fc8031ee85d9447e6af06c7737ba2 -MISC ChangeLog 21927 RMD160 469637f8638905836a9d4969fa1a87807b188cdd SHA1 5c1d2ab18a1ba1ae04ccf72ff726bf952642f078 SHA256 73629c10499f825d5c2dcbf636f6643f6eefdf34fec4ca5d4c27d0a9f775afcb +EBUILD gpgme-1.1.8-r1.ebuild 1086 RMD160 a40f41a374992bd8977bfda07a8592ba4e4b0a29 SHA1 06201355aa0a9ddb168f0a5d620ad29ca1a5757d SHA256 fb75e612316ffc3f07b52d31c80e6a32224548f88cfb2160b169450cf6fc5263 +MISC ChangeLog 22361 RMD160 c1715891d2856b2db34d168438614a1b3d6d43f8 SHA1 a07e4079ca5a679b0f65237e9335aabe8e76b8f1 SHA256 2740fb7ad4f1700137141fcdf83435e732550bdbddd567bf38a46dd557223aaa MISC metadata.xml 421 RMD160 6467db2a7ffb640a07bbfb5137c271663ac8613f SHA1 c20459466b39b55995cd1a6bfe4709eb26f2203f SHA256 dc6e832b4e73e3346166e39067104fe27dd0da8569d471958ff1851111cf950b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAklhxhMACgkQV3J2n04EauyvRQCgy/mktTR4AjNOTPzUVVfKDJxY -03kAn3Vdrbf2zv1tr+LvA0ui9mcJTRai -=r0IT ------END PGP SIGNATURE----- diff --git a/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch b/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch deleted file mode 100644 index 26f48b9e884f..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.1.7-_gpgme_cancel_with_err.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gpgme-1.1.7/gpgme/gpgme.h -+++ gpgme-1.1.7-fixed/gpgme/gpgme.h -@@ -1117,6 +1117,8 @@ - - /* Crypto Operations. */ - -+gpgme_error_t _gpgme_cancel_with_err (gpgme_ctx_t ctx, gpg_error_t ctx_err); -+ - /* Cancel a pending asynchronous operation. */ - gpgme_error_t gpgme_cancel (gpgme_ctx_t ctx); - ---- gpgme-1.1.7/gpgme/wait-global.c -+++ gpgme-1.1.7-fixed/gpgme/wait-global.c -@@ -202,7 +202,7 @@ - if (err) - /* An error occured. Close all fds in this context, and - send the error in a done event. */ -- _gpgme_cancel_with_err (ctx, &err); -+ _gpgme_cancel_with_err (ctx, err); - } - break; - diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch new file mode 100644 index 000000000000..dc921eec4056 --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch @@ -0,0 +1,11 @@ +--- ./gpgme-1.1.8/src/gpgme-config.in.orig 2009-03-08 10:25:48.000000000 +1100 ++++ ./gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100 +@@ -64,7 +64,7 @@ + while test $# -gt 0; do + case "$1" in + -*=*) +- optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ++ optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'` + ;; + *) + optarg= diff --git a/app-crypt/gpgme/gpgme-1.1.5.ebuild b/app-crypt/gpgme/gpgme-1.1.5.ebuild deleted file mode 100644 index 3787682fecff..000000000000 --- a/app-crypt/gpgme/gpgme-1.1.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.5.ebuild,v 1.11 2008/01/02 18:26:44 alonbl Exp $ - -inherit libtool - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="http://www.gnupg.org/related_software/gpgme" -SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="1" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND=">=dev-libs/libgpg-error-1.4 - >=dev-libs/pth-1.2 - >=app-crypt/gnupg-1.9.20-r1" - -RDEPEND="${DEPEND} - dev-libs/libgcrypt" - -src_unpack() { - unpack ${A} - cd "${S}" - - # We need to call elibtoolize so that we get sane .so versioning on fbsd. - elibtoolize -} - -src_compile() { - econf \ - --with-pth=yes \ - --includedir=/usr/include/gpgme \ - --with-gpg=/usr/bin/gpg \ - --with-gpgsm=/usr/bin/gpgsm \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO VERSION -} diff --git a/app-crypt/gpgme/gpgme-1.1.7.ebuild b/app-crypt/gpgme/gpgme-1.1.7.ebuild deleted file mode 100644 index 090c36d2b41a..000000000000 --- a/app-crypt/gpgme/gpgme-1.1.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.7.ebuild,v 1.2 2009/01/05 08:15:37 dragonheart Exp $ - -inherit eutils libtool - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="http://www.gnupg.org/related_software/gpgme" -SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="pth" - -DEPEND=">=dev-libs/libgpg-error-1.4 - >=app-crypt/gnupg-1.9.20-r1 - pth? ( >=dev-libs/pth-1.2 )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-_gpgme_cancel_with_err.patch - # We need to call elibtoolize so that we get sane .so versioning on - # fbsd. - elibtoolize -} - -src_compile() { - econf \ - --includedir=/usr/include/gpgme \ - --with-gpg=/usr/bin/gpg \ - --with-gpgsm=/usr/bin/gpgsm \ - $(use_with pth) || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO -} diff --git a/app-crypt/gpgme/gpgme-1.1.8.ebuild b/app-crypt/gpgme/gpgme-1.1.8-r1.ebuild index ec2b46338185..67b2e4544c65 100644 --- a/app-crypt/gpgme/gpgme-1.1.8.ebuild +++ b/app-crypt/gpgme/gpgme-1.1.8-r1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.8.ebuild,v 1.1 2009/01/03 22:43:16 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.8-r1.ebuild,v 1.1 2009/03/07 23:50:42 dragonheart Exp $ -inherit libtool +EAPI=2 +inherit libtool eutils DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" HOMEPAGE="http://www.gnupg.org/related_software/gpgme" @@ -18,22 +19,19 @@ DEPEND=">=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 )" RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { + epatch "${FILESDIR}"/${P}-et_EE.patch # We need to call elibtoolize so that we get sane .so versioning on # fbsd. elibtoolize } -src_compile() { +src_configure() { econf \ --includedir=/usr/include/gpgme \ --with-gpg=/usr/bin/gpg \ --with-gpgsm=/usr/bin/gpgsm \ $(use_with pth) - emake || die "emake failed" } src_install() { |