Drop DEPRECATION flags, bug #387831; drop old.

(Portage version: 2.1.10.29/cvs/Linux x86_64)

3 files changed, 9 insertions, 74 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/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
-}