Drop DEPRECATED flags, bug #384815; drop old.

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

4 files changed, 28 insertions, 35 deletions

diff --git a/gnome-base/libgnomeprintui/ChangeLog b/gnome-base/libgnomeprintui/ChangeLog
index dc80b66abd7e..0498292b5ba0 100644
--- a/gnome-base/libgnomeprintui/ChangeLog
+++ b/gnome-base/libgnomeprintui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnomeprintui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/ChangeLog,v 1.175 2011/03/22 19:18:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/ChangeLog,v 1.176 2011/10/02 20:47:39 pacho Exp $
+
+  02 Oct 2011; Pacho Ramos <pacho@gentoo.org> -libgnomeprintui-2.18.5.ebuild,
+  libgnomeprintui-2.18.6.ebuild:
+  Drop DEPRECATED flags, bug #384815; drop old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   libgnomeprintui-2.18.6.ebuild:
diff --git a/gnome-base/libgnomeprintui/Manifest b/gnome-base/libgnomeprintui/Manifest
index 14ad07f442ea..b7f88ee00fb2 100644
--- a/gnome-base/libgnomeprintui/Manifest
+++ b/gnome-base/libgnomeprintui/Manifest
@@ -1,6 +1,14 @@
-DIST libgnomeprintui-2.18.5.tar.bz2 677362 RMD160 9604a58d2da520cec5506e9ba44962eca9155974 SHA1 ef641569b5a454e89250ae13da5b74620552e9d8 SHA256 48ef73621dc2d208f81031dc87d18757879761ca176df80f46fafcfd9af9449f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libgnomeprintui-2.18.6.tar.bz2 681125 RMD160 772ebeb7e59906734014eb8f2f2fedba91c8f1a9 SHA1 07030a1726ccb927158591087fb0e96f40d95cfa SHA256 156ae5b66e5dcc546efa2449048f792d76c55b30d93a9b67b0c69665e346f46a
-EBUILD libgnomeprintui-2.18.5.ebuild 886 RMD160 5647430bc4d39ffbf5f310f3dc876248f6050ee8 SHA1 c5489d07b0d0ef8a34d81722cf0716bac2036b07 SHA256 ab94bd4ad02a372657e50a138858f2ab7058ebaf1c41ec305215fba76dfe6a7d
-EBUILD libgnomeprintui-2.18.6.ebuild 888 RMD160 7a1cedf0814b6f975d9ad25a3f7e9ca757b17f3f SHA1 2a98da1cfc92060e07a52c89e95407ecf2d57679 SHA256 52c89cd8ca12d648576a2f4d8929f58d174ebe179946cd55a4c010692ba28bef
-MISC ChangeLog 21237 RMD160 e137493bbe3b601db69ac00b5079d6355b375b45 SHA1 2ecfd95ae0fb4a2f9c5894b694dec5921834a125 SHA256 2b9c3c680892a21b4f65f14ee2925fba2ea2b87b63454d203bd2ec51c065582d
+EBUILD libgnomeprintui-2.18.6.ebuild 1197 RMD160 11dbbe98fb85fe8f543d0ef234011a5c4fb3ff47 SHA1 0fec23c0c6451780b96f271db9ab7e9efcbc3be3 SHA256 3cc3c7ba6dbe34d642c6772923d8a60dbcd0a4e3d3aae66904d3d89b36639dd0
+MISC ChangeLog 21396 RMD160 96a026f9c15179f645816bebe64c0dc984f3daf8 SHA1 7602faff8e8e2ac8fb5202048b6806e3e44e365c SHA256 7572cc021734a6c01a6d94eb0de08d1442b422411b1d036faa82821d7f1b9bca
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk6IzfEACgkQCaWpQKGI+9QbRwCdEcpN6uibzVmULChAIrL/7fjo
+c6UAnRW005cpUKONuRO64um5vH/tLvEe
+=paVr
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.5.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.5.ebuild
deleted file mode 100644
index abf599f2a7d0..000000000000
--- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-2.18.5.ebuild,v 1.8 2010/10/07 22:50:10 ssuominen Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit gnome2
-
-DESCRIPTION="User interface libraries for gnome print"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=gnome-base/libgnomeprint-2.12.1
-	>=gnome-base/libgnomecanvas-1.117
-	>=x11-themes/gnome-icon-theme-1.1.92"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-static"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild
index 35478c45249c..7c5decabd807 100644
--- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.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/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild,v 1.7 2011/03/22 19:18:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild,v 1.8 2011/10/02 20:47:39 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -28,3 +28,13 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF} --disable-static"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags, bug #384815
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		libgnomeprintui/gpaui/Makefile.am libgnomeprintui/gpaui/Makefile.in \
+		libgnomeprintui/Makefile.am libgnomeprintui/Makefile.in \
+		tests/Makefile.am tests/Makefile.in || die
+}