Drop DEPRECATED flags, bug #384807; remove old.

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

4 files changed, 29 insertions, 49 deletions

diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog
index 44dba48c18db..de3f5769a07a 100644
--- a/gnome-base/libgnomeprint/ChangeLog
+++ b/gnome-base/libgnomeprint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnomeprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.189 2011/03/22 19:17:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.190 2011/10/02 20:40:20 pacho Exp $
+
+  02 Oct 2011; Pacho Ramos <pacho@gentoo.org> -libgnomeprint-2.18.7.ebuild,
+  libgnomeprint-2.18.8.ebuild:
+  Drop DEPRECATED flags, bug #384807; remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libgnomeprint-2.18.8.ebuild:
   Marking libgnomeprint-2.18.8 ppc stable for bug 353436
diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest
index 42018fe1dfd4..33cb01e6cbde 100644
--- a/gnome-base/libgnomeprint/Manifest
+++ b/gnome-base/libgnomeprint/Manifest
@@ -1,6 +1,14 @@
-DIST libgnomeprint-2.18.7.tar.bz2 858527 RMD160 5202ef3d8187f6b01a16ac8f97d924074cbdf91d SHA1 f7c550abacf22f602ca097f9033803bf9d4556de SHA256 8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libgnomeprint-2.18.8.tar.bz2 880489 RMD160 4f786ad61dc27177c350a5baa27cfc8b1140c32e SHA1 cfb77148923b24b1651982a21b3cb55e312ff6d5 SHA256 1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691
-EBUILD libgnomeprint-2.18.7.ebuild 1210 RMD160 48960d4cce3a141ba7fd3c23895f299cfcf044e0 SHA1 3e4e839a0dfaaff83214f874201c03af8622e472 SHA256 1f1598bdf4374343db2415be06b4cd213f6abf5b3c299d947aa89318a6a301c9
-EBUILD libgnomeprint-2.18.8.ebuild 1226 RMD160 a2543a4967162f340d319ce658dd1d81b293aabb SHA1 ea68f20660de7054a382489adffd5f69ba18693d SHA256 c8bd9a95c45c80f51e62c10d025a195258d72f8991514d75e8ed9a9f813c42c6
-MISC ChangeLog 22833 RMD160 30f574ffd0d57673dbf4ad3f32d320e4922474d1 SHA1 8c2048b17c64790df77ce7339f195b73bd84bb38 SHA256 d1630d4d5b9c0bb9396ecd986d106d2da0730472f3fb808777e43f77fbd35f14
+EBUILD libgnomeprint-2.18.8.ebuild 1521 RMD160 270e4ad56af26ae3bc7573ccacb214152875fd2b SHA1 6127f73788cc003a9a04145cbc926134e55d05ed SHA256 5a8d1548430c0edb9ef80ce3037907e9e5785da688cb000704a8715f50708032
+MISC ChangeLog 22990 RMD160 ce48933f63587e2a087bd30dc249de9d58f0920c SHA1 e3cb0ad41ebb27e2b7b38402f1c680405ede9954 SHA256 1862fe4d1ebaa3118618036f963074408389a536396fe0ca0647f0547812e15b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk6IzDoACgkQCaWpQKGI+9SRVwCfZ82bXx5rqoT8kGXCs28IkZdL
+OpsAniHdMIOmlIqk29VowapFSVW7Bh1j
+=E9Ap
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.7.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.7.ebuild
deleted file mode 100644
index 8da16a7ff983..000000000000
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.7.ebuild
+++ /dev/null
@@ -1,43 +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/libgnomeprint/libgnomeprint-2.18.7.ebuild,v 1.8 2010/10/08 19:49:29 ssuominen Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Printer handling for Gnome"
-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="cups doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=media-libs/libart_lgpl-2.3.7
-	>=x11-libs/pango-1.5
-	>=dev-libs/libxml2-2.4.23
-	>=media-libs/fontconfig-1
-	>=media-libs/freetype-2.0.5
-	sys-libs/zlib
-	cups? (
-		>=net-print/cups-1.1.20
-		>=net-print/libgnomecups-0.2 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	sys-devel/flex
-	sys-devel/bison
-	doc? (
-		~app-text/docbook-xml-dtd-4.1.2
-		>=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS BUGS ChangeLog* NEWS README"
-
-pkg_setup() {
-	# Disable papi support until papi is in portage; avoids automagic
-	# dependencies on an untracked library.
-	G2CONF="$(use_with cups) --without-papi --disable-static"
-}
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
index 10417e0face0..23733f9f3dd1 100644
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.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/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.6 2011/03/22 19:17:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.7 2011/10/02 20:40:20 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -42,3 +42,14 @@ pkg_setup() {
 	# dependencies on an untracked library.
 	G2CONF="${G2CONF} $(use_with cups) --without-papi --disable-static"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags, bug #384807
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \
+		configure.in configure || die
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		libgnomeprint/ttsubset/Makefile.am \
+		libgnomeprint/ttsubset/Makefile.in || die
+}