Drop DEPRECATION flags, bug #387831; drop old.

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

4 files changed, 21 insertions, 78 deletions

diff --git a/app-crypt/gringotts/ChangeLog b/app-crypt/gringotts/ChangeLog
index 9c062b310927..d87f6d58b5f0 100644
--- a/app-crypt/gringotts/ChangeLog
+++ b/app-crypt/gringotts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gringotts
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/ChangeLog,v 1.38 2011/03/22 18:44:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/ChangeLog,v 1.39 2011/10/20 22:42:16 pacho Exp $
+
+  21 Oct 2011; Pacho Ramos <pacho@gentoo.org> -gringotts-1.2.9.ebuild,
+  gringotts-1.2.10.ebuild:
+  Drop DEPRECATION flags, bug #387831; drop old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gringotts-1.2.10.ebuild:
   Marking gringotts-1.2.10 ppc stable for bug 353436
diff --git a/app-crypt/gringotts/Manifest b/app-crypt/gringotts/Manifest
index 23640b053dda..5fd828754caf 100644
--- a/app-crypt/gringotts/Manifest
+++ b/app-crypt/gringotts/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gringotts-1.2.10-desktop.patch 835 RMD160 282bd57e69ba3ce398753bc483f6ad49c33585c6 SHA1 91de6e2eaa093f090b7db01522cd99dab9be3f43 SHA256 447dd6d57980c572bf428dcd2f001e31d9b48b090953d84f55e1b0a9726eb938
 AUX gringotts-1.2.10-no-strip.patch 682 RMD160 0c3a874d631f0f392d7923003c7dd5c18824757c SHA1 ebc4ce049ca38c306c94f9a32ed39bcd74834d6d SHA256 d923deef0a471c83232ffe72c619c5c7066880153a95a0e440387b5243f23164
 AUX gringotts-1.2.8-desktop-entry.patch 512 RMD160 82d5a5ffed9f4496fab9670dede562281ab01304 SHA1 4f6d5523ce1acd5ef36a2bd01162910b30f58294 SHA256 f1682326f93cfff6d970fbd69391e9b84d9ff827bf6525b1f06e4e275bfd91e3
 AUX gringotts-1.2.8-desktop.patch 372 RMD160 45846070b6cee6c308ea30663ee29ecc8238c53e SHA1 84f9a4a68c2f74e9fb41a2e364394734afee3c04 SHA256 836eda164efcc6cbff63e37287b21d153c6025d3b30fd46b4ba1e8f16702dda8
 AUX gringotts-1.2.8-no-strip.patch 302 RMD160 c9341313e9764570490b44563a8bda146df1eb50 SHA1 cb6926f88d1e65332c87042f1ea0448d0eaa898e SHA256 06aefb027d86892a794a003f01b69d25f26206f8aad3297fbec75dee233e81ea
 DIST gringotts-1.2.10.tar.gz 251963 RMD160 6076b08010fe32166bbb6a0399feef8319ed7442 SHA1 326510496bbcc4974bec91882633d50198994a35 SHA256 19784f68f76b211d076124c74d2f5ca5a156e4af7ed32d72a1ba45547782179d
-DIST gringotts-1.2.9.tar.gz 249213 RMD160 7284586075511533566be87d52497bcad8fdf2de SHA1 72ffaa6a86b6ea419f0aa7642f816133bac376a4 SHA256 f7fcd3f9fa54fb6372136fa5bdde0740ed03b736cf0fc06626303ea9727e9965
-EBUILD gringotts-1.2.10.ebuild 1973 RMD160 df6c7d8bae6aa5973a9af66c65a6252a0cb592ab SHA1 433af32671ded00138bd62cade0621f5e0ae9357 SHA256 cd43b9b18c62771d636805e155dea1d676fe23d560fa59bf5801d9ce4feb89bf
-EBUILD gringotts-1.2.9.ebuild 1777 RMD160 2580d4b20acad776e89a641a7a1db9d6cb739389 SHA1 a999e0b59e4c54775997f07b3799dae14a50339c SHA256 3c2bd5411c8ec4a6933d83530f6d0fb64adb266a460766e64afe194210ca6f1c
-MISC ChangeLog 5764 RMD160 18d953c6ee88af0856ba0a9460acb702184ed675 SHA1 a6fd1d80631f46e62912c6e4d88ca8310a696d1b SHA256 041ff67ab1e159203b190e0b6de81093fa2124cda7ce8b2cde52551cadb01ee3
+EBUILD gringotts-1.2.10.ebuild 1949 RMD160 ef92ec2ddaecd41b78fb6fb7b406ef134721ca3d SHA1 4b02d6d157229eb387331c9c828663a78b5b0bf9 SHA256 b1bf8e4f9ed728154a99f8ea804e8f76ea86d36f701f8f4c441664d4cef78de0
+MISC ChangeLog 5911 RMD160 a03f79ad533f3147d859a427ca9a993ec5a4f8f4 SHA1 8d4daf70e7c49e3ed7e5cb386055ada1a2fe042e SHA256 bb0b8878dd82e5168892f093f731b4aae3b456c688d359489456969617aa345e
 MISC metadata.xml 431 RMD160 7f8004f76ba2bc5e3e9c8f2f54101eb025822f3b SHA1 3304771bba8ef2a6cbfe6d5575fc57fa41143873 SHA256 395ac4003b0361b36467da529ada678cde96aa427767124d7b65ff9abab8507b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk6go84ACgkQCaWpQKGI+9T3tACfVOwxmv6lF5jrdPuL355voYDx
+09UAn3aNMqAUtrJybVvBxUkMhPi2lF6Z
+=ATRk
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gringotts/gringotts-1.2.10.ebuild b/app-crypt/gringotts/gringotts-1.2.10.ebuild
index 8003117ff6db..4bff5c793a2b 100644
--- a/app-crypt/gringotts/gringotts-1.2.10.ebuild
+++ b/app-crypt/gringotts/gringotts-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.10.ebuild,v 1.5 2011/03/22 18:44:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.10.ebuild,v 1.6 2011/10/20 22:42:16 pacho Exp $
 
 EAPI="2"
 
@@ -24,9 +24,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	# Remove deprecation flag, soit compiles with >=GTK+-2.4
-	sed -e 's:-DGTK_DISABLE_DEPRECATED::g' \
-		-i src/Makefile.am src/Makefile.in || die "sed failed"
+	# Drop DEPRECATION flags, bug #387831
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		src/Makefile.am src/Makefile.in || die
 
 	# Patch up to install desktop entry correctly
 	epatch "${FILESDIR}/${PN}-1.2.10-desktop.patch"
diff --git a/app-crypt/gringotts/gringotts-1.2.9.ebuild b/app-crypt/gringotts/gringotts-1.2.9.ebuild
deleted file mode 100644
index 085d4739f44f..000000000000
--- a/app-crypt/gringotts/gringotts-1.2.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.9.ebuild,v 1.7 2011/03/06 23:48:37 nirbheek Exp $
-
-EAPI="1"
-
-inherit autotools eutils fdo-mime
-
-DESCRIPTION="Utility that allows you to jot down sensitive data"
-HOMEPAGE="http://gringotts.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="suid"
-
-RDEPEND=">=dev-libs/libgringotts-1.2
-		 >=x11-libs/gtk+-2.12:2
-		 dev-libs/popt"
-
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove deprecation flag, soit compiles with >=GTK+-2.4
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' src/Makefile.am
-
-	# Patch up to install desktop entry correctly
-	epatch "${FILESDIR}/${PN}-1.2.8-desktop.patch"
-	epatch "${FILESDIR}/${PN}-1.2.8-desktop-entry.patch"
-
-	# Prevent prestripping
-	epatch "${FILESDIR}/${PN}-1.2.8-no-strip.patch"
-
-	eautomake
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	# The FAQ and README documents shouldn't be gzip'd, as they need to be
-	# available in plain format when they are called from the `Help' menu.
-	#
-	# dodoc FAQ README
-	dodoc AUTHORS BUGS ChangeLog TODO
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use suid; then
-		ewarn "You have installed a suid binary for the \`gringotts' program."
-		ewarn "Be aware that this setup may break with some glibc installations"
-		ewarn "For more information, see bug #69458 in Gentoo's bugzilla at:"
-		ewarn "  http://bugs.gentoo.org/"
-	else
-		einfo "Changing permissions for the gringotts binary."
-		chmod u-s "${ROOT}"/usr/bin/gringotts
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}