add missing pkgconfig dep, bug #205607, make it build with gtk 2.12

Package-Manager: portage-2.1.4

5 files changed, 79 insertions, 42 deletions

diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 6d2b4f92ade3..310255b4f8c0 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -2,29 +2,19 @@
 Hash: SHA1
 
 DIST lash-0.5.1.tar.gz 547198 RMD160 6869e590f1c46e4f661079e60c7e9fa13099f05c SHA1 f31fee8dde3fa86b7e6558ab8e46a57f130a327d SHA256 ebae44d06d25748d8b8420827ec80970c8ed5c00055ccacc5d58603af29abd85
-DIST lash-0.5.2.tar.gz 534176 RMD160 111623271c4d6916d075fafa93057d8820f1ce78 SHA1 e5e99f7c9c36ee2d32dc816ba422e07b4e681a1b SHA256 ebc9f1b5b551cacf261299977068ce1547c13174fb6258d1ef8d2bfeb346794c
-DIST lash-0.5.3.tar.gz 618942 RMD160 52128688c0c18782b72daae57b8e50355e6ba43b SHA1 7266f8757417307711a2436d896d2552b82af8e2 SHA256 de6b1a76e79f2e1d8b6aefe33432ff2914940bab467a2fa127f7993753e182ce
 DIST lash-0.5.4.tar.gz 623469 RMD160 251a20c0597b8ec6fac2a39bab1d18ab5c017f40 SHA1 d8fa24ebef0807c3b0426894d7ecd6229fda28b4 SHA256 105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16
 EBUILD lash-0.5.1.ebuild 966 RMD160 c60049cdf00f5f030cf14dddb8c78261ec17ff41 SHA1 cdaeb7f9a935a18738c6ccecf518239278bf7564 SHA256 5b8c4829ad0e63d9a9b9abbea3b85a5767ebd46797f9c8d789c206bfac9cf35d
 MD5 17e014145b97915f795cf84d37e01a72 lash-0.5.1.ebuild 966
 RMD160 c60049cdf00f5f030cf14dddb8c78261ec17ff41 lash-0.5.1.ebuild 966
 SHA256 5b8c4829ad0e63d9a9b9abbea3b85a5767ebd46797f9c8d789c206bfac9cf35d lash-0.5.1.ebuild 966
-EBUILD lash-0.5.2.ebuild 970 RMD160 527a66fdb87c91c84ceb07e31ea3b6d55d3ba771 SHA1 9fb120f97997400057907e4d847211b87d5d4160 SHA256 ea45a122b20ee24d0afefe0a7f0a7008c5ba12d11b4075d4e5273710a02c1a08
-MD5 d5d7b88349df433a14d9ba445920201a lash-0.5.2.ebuild 970
-RMD160 527a66fdb87c91c84ceb07e31ea3b6d55d3ba771 lash-0.5.2.ebuild 970
-SHA256 ea45a122b20ee24d0afefe0a7f0a7008c5ba12d11b4075d4e5273710a02c1a08 lash-0.5.2.ebuild 970
-EBUILD lash-0.5.3.ebuild 1490 RMD160 63fff2a905bd5f9faf3d096898d433b3e28b70a3 SHA1 27416d9c73e0cb8519b408d64f231f84d8129f4b SHA256 01615c7658fc0fdc9fd59554868aa61b92baef3fb20866614db28a1a6de103b8
-MD5 33ba2af34bfbff30d0e7bfeadcfaa6f3 lash-0.5.3.ebuild 1490
-RMD160 63fff2a905bd5f9faf3d096898d433b3e28b70a3 lash-0.5.3.ebuild 1490
-SHA256 01615c7658fc0fdc9fd59554868aa61b92baef3fb20866614db28a1a6de103b8 lash-0.5.3.ebuild 1490
 EBUILD lash-0.5.4.ebuild 1491 RMD160 4774566e276372902804fa859d52a38da5940df4 SHA1 343a98899906619271d19058c861dda9e41821e7 SHA256 9f6dd168e50be2fc747fa05984301ef60be84ef275b880ce754f6977a832540b
 MD5 36086521dc93ff12ac020291a78c4840 lash-0.5.4.ebuild 1491
 RMD160 4774566e276372902804fa859d52a38da5940df4 lash-0.5.4.ebuild 1491
 SHA256 9f6dd168e50be2fc747fa05984301ef60be84ef275b880ce754f6977a832540b lash-0.5.4.ebuild 1491
-MISC ChangeLog 2312 RMD160 2bdc8baa9e75bc7634eecb9a1466b32deca12d33 SHA1 cf60dc5da85b96a55b366a93414539803d173101 SHA256 f6c89d84a4d8867cb05193ca6ce9ebb84a4c8a37036dea22c60233cc003cac2a
-MD5 243e527d3a4fc8b237e934d2665bd014 ChangeLog 2312
-RMD160 2bdc8baa9e75bc7634eecb9a1466b32deca12d33 ChangeLog 2312
-SHA256 f6c89d84a4d8867cb05193ca6ce9ebb84a4c8a37036dea22c60233cc003cac2a ChangeLog 2312
+MISC ChangeLog 2420 RMD160 f8d6f06fd8dfe2d36c0923e107baad7d3c539652 SHA1 3d8ad2c0e80f1830b0b99f14af808b60320acf3a SHA256 19f11e45fd87ddee956244b1ff9de69deb4fb18225f91442cacdab1e12b40a0f
+MD5 1347b81ae34645955779245094614a94 ChangeLog 2420
+RMD160 f8d6f06fd8dfe2d36c0923e107baad7d3c539652 ChangeLog 2420
+SHA256 19f11e45fd87ddee956244b1ff9de69deb4fb18225f91442cacdab1e12b40a0f ChangeLog 2420
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
@@ -32,19 +22,13 @@ SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e metadata
 MD5 9af130f2d354afbb1d485354b6fee29e files/digest-lash-0.5.1 232
 RMD160 6bd0e34300ae51985b369454da0d4ff25759e498 files/digest-lash-0.5.1 232
 SHA256 9da1dac5bffb4cd12398e1d440cc108a3c3deca4560e5d28b4d367e656f1365c files/digest-lash-0.5.1 232
-MD5 ce51f2ca2c922ec3d5a38e7fe2707205 files/digest-lash-0.5.2 232
-RMD160 6023eae460ad0dcf49f0d1df1bf372cdb4375abe files/digest-lash-0.5.2 232
-SHA256 1e9602c5985edbb54bbd84a1ac7b63f95e999b2b05c69a2514a320ecddaf3004 files/digest-lash-0.5.2 232
-MD5 87fd6facb564646d0729efcac2757cf0 files/digest-lash-0.5.3 232
-RMD160 8f96b8eb3c5e61826f962bf8280ce53e0d7d9fa7 files/digest-lash-0.5.3 232
-SHA256 a14562996ef63f6e29441853840a874d2ef5e16b2760ad8abd36696c236c0878 files/digest-lash-0.5.3 232
 MD5 e3a877cf607e352c07e66d8a661f8670 files/digest-lash-0.5.4 232
 RMD160 fb9b4aaac56b6a5a9e5be024ca4d14a174eb9639 files/digest-lash-0.5.4 232
 SHA256 f849e8e1a365342440dec65e6b6b00fbc73dcdd8ca33da06a7d939d6048d264a files/digest-lash-0.5.4 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHZU1IvFcC4BYPU0oRAvrzAKCrFdrl1mToCxp8KY7YMAgLeV6nTwCfVxiY
-8vS0ziRczsZpGna3CZ3/F9s=
-=Muxi
+iD8DBQFHiiC8vFcC4BYPU0oRAsVGAJ4+4zAPck0m6A2+rXRmWWXJ7qobFQCcCg8/
+YMAIxnKcw1FlvBdV5yac0rs=
+=FiAl
 -----END PGP SIGNATURE-----
diff --git a/media-sound/quark/ChangeLog b/media-sound/quark/ChangeLog
index 0898465042b6..e5441fc52a31 100644
--- a/media-sound/quark/ChangeLog
+++ b/media-sound/quark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/quark
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.12 2007/02/22 01:22:08 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.13 2008/01/13 14:26:45 aballier Exp $
+
+  13 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/quark-3.21-nogtkdisabledeprecated.patch, quark-3.21.ebuild:
+  make it build with gtk 2.12
+
+  13 Jan 2008; Alexis Ballier <aballier@gentoo.org> quark-3.21.ebuild:
+  add missing pkgconfig dep, bug #205607
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest
index 17ccb55d5377..fbd710154762 100644
--- a/media-sound/quark/Manifest
+++ b/media-sound/quark/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX quark-3.21-nogtkdisabledeprecated.patch 858 RMD160 36dc384810743766c880df59df44b38de935f0f1 SHA1 23a45673cb0a9bf51beebb4116fa0e606f84aaf4 SHA256 11fdfba8e4241f67fa46fc9bb1794066c17668a5ee96eb434eb4b71f02d089c0
+MD5 f395ee8fcd01f1c7552199f1791fdb1d files/quark-3.21-nogtkdisabledeprecated.patch 858
+RMD160 36dc384810743766c880df59df44b38de935f0f1 files/quark-3.21-nogtkdisabledeprecated.patch 858
+SHA256 11fdfba8e4241f67fa46fc9bb1794066c17668a5ee96eb434eb4b71f02d089c0 files/quark-3.21-nogtkdisabledeprecated.patch 858
 DIST quark-3.21.tar.gz 204423 RMD160 93bae6c7bd45fd68ab4f339ab110a599cf39835d SHA1 79497854141fb8fe994b817d7ef0d494c8cb6225 SHA256 45b0b17c82f4c4ed58fc76548dba6ca3e766391c5e42ea5f207249056514ac6b
-EBUILD quark-3.21.ebuild 801 RMD160 f73099f2cab670e79bbcef22e5d9eb9d415fd7f3 SHA1 b0f9f7feccdbe34a4b3e296e83f57fb156539bfe SHA256 9a1ff44c7b0f64c7d6f78d975b8ede32bb25f7e262dc870792127a738ece2674
-MD5 cdc90b09f16c5a9026785951b9584a3b quark-3.21.ebuild 801
-RMD160 f73099f2cab670e79bbcef22e5d9eb9d415fd7f3 quark-3.21.ebuild 801
-SHA256 9a1ff44c7b0f64c7d6f78d975b8ede32bb25f7e262dc870792127a738ece2674 quark-3.21.ebuild 801
-MISC ChangeLog 1109 RMD160 723dab5b162b4e6bdc0156e6da4e90952cee983d SHA1 b6e2124f92ef12362da35a0d14ce7c8da6b7bdbb SHA256 47950a5020c76471d01bed4bb6ca1ee957e14eac88e760dc8f0a03f38b15b7e1
-MD5 f45ffcac6366d6f39232626dff7ceb0e ChangeLog 1109
-RMD160 723dab5b162b4e6bdc0156e6da4e90952cee983d ChangeLog 1109
-SHA256 47950a5020c76471d01bed4bb6ca1ee957e14eac88e760dc8f0a03f38b15b7e1 ChangeLog 1109
+EBUILD quark-3.21.ebuild 958 RMD160 8b4172f0b73bc25d91cb1c64aa53c0e8b02bd2a5 SHA1 cfc2b31996b9b96634f625e44e4c9a7a74469f54 SHA256 eb7584e75ea0ca874f07a1afb16f67a2906b24b1fe8250b357628afc59430d43
+MD5 3474b3331fbdfc17cbf49a8ea0f9cb97 quark-3.21.ebuild 958
+RMD160 8b4172f0b73bc25d91cb1c64aa53c0e8b02bd2a5 quark-3.21.ebuild 958
+SHA256 eb7584e75ea0ca874f07a1afb16f67a2906b24b1fe8250b357628afc59430d43 quark-3.21.ebuild 958
+MISC ChangeLog 1377 RMD160 8511d06070941e03541a6982b07cfc1dfcf80783 SHA1 c8f89c64bb4639ba462bf4cdb49ccd1e776edebc SHA256 c10586dc0dcf10ca4d6a12fc30a4bd99192d4c72d126482121babac61fd7ce57
+MD5 f458cb6d37834b53378f248643bc2f08 ChangeLog 1377
+RMD160 8511d06070941e03541a6982b07cfc1dfcf80783 ChangeLog 1377
+SHA256 c10586dc0dcf10ca4d6a12fc30a4bd99192d4c72d126482121babac61fd7ce57 ChangeLog 1377
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -14,3 +21,10 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 984aff50b30b985c822340116aee5160 files/digest-quark-3.21 232
 RMD160 c15ca1d29308ffa707dacbfb70da11373649c831 files/digest-quark-3.21 232
 SHA256 58e393fe96b6538b4b525b68c6b863388a4afd8f00d24f2f78041c06aab3e889 files/digest-quark-3.21 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHih//vFcC4BYPU0oRAo02AJ0VuS73xnR2a+Tq9w1HMVHmyJU/ewCfZhvF
+mvKu+qNqemXqdiyrSUpI2BQ=
+=oCDv
+-----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
new file mode 100644
index 000000000000..b4872b1bcb00
--- /dev/null
+++ b/media-sound/quark/files/quark-3.21-nogtkdisabledeprecated.patch
@@ -0,0 +1,24 @@
+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)\" \
+Index: quark-3.21/strange-quark/Makefile.in
+===================================================================
+--- quark-3.21.orig/strange-quark/Makefile.in
++++ quark-3.21/strange-quark/Makefile.in
+@@ -155,7 +155,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 497a2fd18d87..b01b7f89643c 100644
--- a/media-sound/quark/quark-3.21.ebuild
+++ b/media-sound/quark/quark-3.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.10 2007/01/05 17:48:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.21.ebuild,v 1.11 2008/01/13 14:26:45 aballier Exp $
 
 IUSE=""
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
 SRC_URI="http://quark.nerdnest.org/${P}.tar.gz"
@@ -15,17 +15,25 @@ KEYWORDS="alpha amd64 ppc sparc x86"
 
 LICENSE="GPL-2"
 
-DEPEND=">=media-libs/xine-lib-1_beta10
+RDEPEND=">=media-libs/xine-lib-1_beta10
 	>=x11-libs/gtk+-2.2.1
 	>=gnome-base/gconf-2.2.0
 	>=gnome-base/gnome-vfs-2.0.4-r2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 DOCS="AUTHORS README"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nogtkdisabledeprecated.patch"
+}
+
 pkg_postinst () {
-	elog Quark is an anti-gui music player.
-	elog
-	elog Running the binary strange-quark will launch it in a
-	elog freedesktop.org dock ie: Gnome Notification Area
-	elog
+	elog "Quark is an anti-gui music player."
+	elog ""
+	elog "Running the binary strange-quark will launch it in a"
+	elog "freedesktop.org dock ie: Gnome Notification Area"
+	elog ""
 }