From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 29 Sep 2011 09:58:16 +0000 (+0000)
Subject: Change GCONF_DEBUF to GCONF_DEBUG to match gnome2.eclass. Remove -DG_DISABLE_DEPRECAT... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6a628a7882cc6703f33df67c14b6962ff10e0d2a;p=gentoo.git

Change GCONF_DEBUF to GCONF_DEBUG to match gnome2.eclass. Remove -DG_DISABLE_DEPRECATED and -DGTK_DISABLE_DEPRECATED from build system to allow building against glib-2.30 and pango-1.28.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
---

diff --git a/dev-libs/libunique/ChangeLog b/dev-libs/libunique/ChangeLog
index 892602b0f6d5..6aa81168e282 100644
--- a/dev-libs/libunique/ChangeLog
+++ b/dev-libs/libunique/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libunique
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.43 2011/07/25 15:18:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.44 2011/09/29 09:58:16 ssuominen Exp $
+
+  29 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libunique-3.0.2.ebuild:
+  Change GCONF_DEBUF to GCONF_DEBUG to match gnome2.eclass. Remove
+  -DG_DISABLE_DEPRECATED and -DGTK_DISABLE_DEPRECATED from build system to
+  allow building against glib-2.30 and pango-1.28.
 
 *libunique-1.1.6-r1 (25 Jul 2011)
 
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 3d7e74e2b549..8a853792cf9f 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -10,13 +10,17 @@ DIST libunique-1.1.6.tar.bz2 335534 RMD160 2c6894a574eb0f5c91b47cd6214b3f9da63cb
 DIST libunique-3.0.2.tar.xz 294712 RMD160 dca2ee6d37f459acf38b5623626e3885c942353f SHA1 e0d0db598159ed5bad53ad5f9e4469c2d458267c SHA256 a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038
 EBUILD libunique-1.1.6-r1.ebuild 1984 RMD160 102a4fb610c20f2da72451738d758254d1992ac0 SHA1 1ffb70cc94f4a3ea6d3d5d6ea4cd27345770106d SHA256 2e4acc5d2d79104f9c44f3ebf3d8e9f74a97cba9397095fb2f0b3e63aae40345
 EBUILD libunique-1.1.6.ebuild 1418 RMD160 843fc1d56c3d58e8bf59cb5de2405fb7d4d61019 SHA1 5e623e5e2e589748c42a47b630535478ae34c83a SHA256 b0fc4699cd15b44cbe45d673c15411b5908cc668c8b9b20488bf9bb99162b057
-EBUILD libunique-3.0.2.ebuild 1459 RMD160 8a38bb7585bd325117890c11e14a1b19f831f3cc SHA1 ca2ab62ebf865bb0937d7d468471ae8106670860 SHA256 8e5b0782610232a3ec73ab00ed35db3425dd7ffd1f51ec86b94936609bfd059f
-MISC ChangeLog 5921 RMD160 430ede9e07f0a621671c53326669df50b92fe973 SHA1 5727beed7680807f5c9d9c616e70c81732899c81 SHA256 23b43e130a7e0550e2047944eb48f2757c093e5c72c81bcaa399fc2ba412e60c
+EBUILD libunique-3.0.2.ebuild 1623 RMD160 7a34b5e3cec8e1550a8adfd4ff727557460c9508 SHA1 05bfcec6dca51c21fbf7ecf5889d4a939f9817bb SHA256 bf2465bc4a8aff05dafc28167b3874e88643e6df1ea68b12f88bb1c81528b31c
+MISC ChangeLog 6197 RMD160 0d818223af5e48613ebb58ddda05c1af0463153b SHA1 ef2311a08bb4c9614c1577b3ac6ebdc9ac84f7f5 SHA256 6656b374c5c5cd16e95e3ca381cb9eb633f740f475f4c2bdc02a71477ff06cac
 MISC metadata.xml 524 RMD160 e577176f51e67fe729cd025a5bdf1b1f79eeae0a SHA1 ebde47d0175507854c365ffa5c4052e600b28749 SHA256 3fed9bec27e312e7f8a69a581b5d7b931d53137631b65f401ee149818daf9116
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4tiVYACgkQCaWpQKGI+9RsegCgh85KbrWvVHHAKQUsLBKxJWAr
-43EAn2o2G822TZDdxT6tElTYT/YUuMhB
-=Jrk5
+iQEcBAEBAgAGBQJOhEG+AAoJEEdUh39IaPFNqB4H/jw4uPv10g/kEJZKoaofA5gW
+NbpsNrus94fdLto5KRgRQlGbmD0pgrYWntDzqx6XRInGZuvBHwbsEfdBf95Q4Tqx
+NpCxkIDgC/yL7+h9pUXZt4Kh3/utXEXw/ZWnirfemJapw5IVD9MSX7u+zZf/aTPA
+vklxzQic5oCX+6GOsTltLZG+F05mxb70g/6m5Hk0OnkjZE1ykpN3Cs5jhQtX++qE
+/Uq8aUaO9BgPPe5eMe466l+ArbewiTtYpniK5F9cMOLg0FtRQFDjemkgWrNSL2RA
+I0/X+b/xOra7xP8JxXVq2/yuV1Yp0wZJT7CUiFLgqiSJKSBxFyFfUrdI9b+w9Vk=
+=1QAL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libunique/libunique-3.0.2.ebuild b/dev-libs/libunique/libunique-3.0.2.ebuild
index 65cfd7108d02..297f4950699f 100644
--- a/dev-libs/libunique/libunique-3.0.2.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-3.0.2.ebuild,v 1.2 2011/07/11 15:40:12 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-3.0.2.ebuild,v 1.3 2011/09/29 09:58:16 ssuominen Exp $
 
 EAPI="4"
-GCONF_DEBUF="yes"
+GCONF_DEBUG="yes"
 GNOME_TARBALL_SUFFIX="xz"
 GNOME2_LA_PUNT="yes"
 
@@ -38,6 +38,12 @@ pkg_setup() {
 		$(use_enable introspection)"
 }
 
+src_prepare() {
+	# should we sed Makefile.am instead and run eautoreconf?
+	sed -i -e '/DG.*_DISABLE_DEPRECATED/d' unique/Makefile.in || die
+	gnome2_src_prepare
+}
+
 src_test() {
 	cd "${S}/tests"