Drop DEPRECATED flags, bug #387823

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

diff --git a/media-sound/quark/ChangeLog b/media-sound/quark/ChangeLog
index 3278045d9e760d2dc6214006d82e038165e35050..401abc43fd1e2af792008f7ffc66fef03970e6be 100644 (file)
--- a/media-sound/quark/ChangeLog
+++ b/media-sound/quark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/quark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.15 2011/03/29 12:40:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.16 2011/10/20 22:34:22 pacho Exp $
+
+  20 Oct 2011; Pacho Ramos <pacho@gentoo.org> quark-3.21.ebuild,
+  -files/quark-3.21-nogtkdisabledeprecated.patch:
+  Drop DEPRECATED flags, bug #387823
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> quark-3.21.ebuild:
   Fix gtk+ slot deps

diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest
index 6c40eff3777c45ebc900c75dbcef5f29aa492cc3..5e6d94d0353ba998fb6de70483c46b64877c8d9b 100644 (file)
--- a/media-sound/quark/Manifest
+++ b/media-sound/quark/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX quark-3.21-nogtkdisabledeprecated.patch 427 RMD160 f5844b614be6eb3f8be74f50cfe29128e05ca57d SHA1 54ea71e5f66f2857c2fd291f32a46acc1aa2a9dd SHA256 c79d49057a0ae0165ed5708f9f7b0fa660fea41182e0b5d7e1cfd1d3fee8d339
 DIST quark-3.21.tar.gz 204423 RMD160 93bae6c7bd45fd68ab4f339ab110a599cf39835d SHA1 79497854141fb8fe994b817d7ef0d494c8cb6225 SHA256 45b0b17c82f4c4ed58fc76548dba6ca3e766391c5e42ea5f207249056514ac6b
-EBUILD quark-3.21.ebuild 992 RMD160 74e5ac69a420935adb7744c66ced66e9b5b99254 SHA1 f724b7d4cce37d8fa8d2a851efb94c5d9d767877 SHA256 93d0b1836e1de061beac8581fa160404f932bf9948037b3e3b906f5e85aa7f0c
-MISC ChangeLog 1666 RMD160 467c3f5e7d4000e856d3e54079d5f09630035413 SHA1 d69eab51b66549390a9131b461c74c375c23ca28 SHA256 663cf374965a9de5e6ae353336625b5e1f87d7cbadf128b9c0ca9c5022365be2
+EBUILD quark-3.21.ebuild 1096 RMD160 c3a0b2a4b6532e557f7b9ace2ccb0bc390b14f9a SHA1 30f382a897dcc95f29affaa99c450f2d2e59cbf0 SHA256 8ce14b37459fca5d9d2ce0f7e6908bdaced85da77b729a6d920005be8232512c
+MISC ChangeLog 1817 RMD160 1cfd4c07e17761d15d26d0a1d9208b745896b4e9 SHA1 fd4f4f255e880be8ed308fbe94b6fac13bdf6da9 SHA256 aca1f1e6089bf44f6cf425c843016f1badf3b9a496c192052fd4d1c68e2fe64b
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2R0yYACgkQmWq1bYTyC0N1gwEAypuzXflhg2QNdmvpWBm1ffv+
-7+6iDsLaT0Rvr6Zr9joBAIGgmoomgeB0NOXZV3f7pY35o2U5t2brbD414WRIWJWN
-=d81p
+iEYEARECAAYFAk6gofQACgkQCaWpQKGI+9TCrACffnKdy+24oeElwnkAy6tl8zjf
+G0IAn2Li1WNlZfUqUeOTyzucqqb1LNdR
+=Qibn
 -----END PGP SIGNATURE-----

diff --git a/media-sound/quark/files/quark-3.21-nogtkdisabledeprecated.patch b/media-sound/quark/files/quark-3.21-nogtkdisabledeprecated.patch
deleted file mode 100644 (file)
index 8f8ac80..0000000
--- a/media-sound/quark/files/quark-3.21-nogtkdisabledeprecated.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: quark-3.21/strange-quark/Makefile.am
-===================================================================
---- quark-3.21.orig/strange-quark/Makefile.am
-+++ quark-3.21/strange-quark/Makefile.am
-@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
-   $(GTK_CFLAGS) \
-   $(GCONF_CFLAGS) \
-   $(GDK_PIXBUF_CFLAGS) \
--  -DGTK_DISABLE_DEPRECATED \
-   -DG_DISABLE_DEPRECATED \
-   -DG_LOG_DOMAIN=\"strange-quark\" \
-   -DPIXMAPDIR=\"$(pixmapdir)\" \

diff --git a/media-sound/quark/quark-3.21.ebuild b/media-sound/quark/quark-3.21.ebuild
index e9437e18ddddc32d68ea762c64b3f2a38f5e839c..deb9e63d55a69e9b022eef0d5291edb36b3ed60a 100644 (file)
--- a/media-sound/quark/quark-3.21.ebuild
+++ b/media-sound/quark/quark-3.21.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.21.ebuild,v 1.14 2011/03/29 12:40:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.21.ebuild,v 1.15 2011/10/20 22:34:22 pacho Exp $
 
-EAPI=1
-inherit gnome2 eutils autotools
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit gnome2
 
 DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
 SRC_URI="http://quark.nerdnest.org/${P}.tar.gz"
@@ -24,11 +26,11 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS README"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${P}-nogtkdisabledeprecated.patch"
-       eautoreconf
+src_prepare() {
+       # Drop DEPRECATED flags, bug #387823
+       sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+               strange-quark/Makefile.am strange-quark/Makefile.in \
+               quark/Makefile.am quark/Makefile.in || die
 }
 
 pkg_postinst () {