Added patch to allow the use of system iniparser. Many thanks to Diego E. Pettenò <flameeyes@gentoo.org> for the help with auto-tools.

Dropped ppc/ppc64 keywords until iniparser is keyworded. Fixes bug 259715.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 96 insertions, 2 deletions

diff --git a/x11-libs/libcompizconfig/ChangeLog b/x11-libs/libcompizconfig/ChangeLog
index 64f170c7ca39..2f7ae5beed46 100644
--- a/x11-libs/libcompizconfig/ChangeLog
+++ b/x11-libs/libcompizconfig/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libcompizconfig
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/ChangeLog,v 1.16 2009/04/25 16:05:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/ChangeLog,v 1.17 2009/04/27 02:02:32 jmbsvicetto Exp $
+
+  27 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/libcompizconfig-0.8.2-allow-system-libiniparser.patch,
+  +libcompizconfig-0.8.2-r1.ebuild:
+  Added patch to allow the use of system iniparser. Many thanks to Diego E.
+  Pettenò <flameeyes@gentoo.org> for the help with auto-tools. Dropped
+  ppc/ppc64 keywords until iniparser is keyworded. Fixes bug 259715.
+
+*libcompizconfig-0.8.2-r1 (27 Apr 2009)
 
   25 Apr 2009; Brent Baude <ranger@gentoo.org> libcompizconfig-0.8.2.ebuild:
   Marking libcompizconfig-0.8.2 ~ppc for bug 246804
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
index bbc0de87bdc4..42f4ee3520d4 100644
--- a/x11-libs/libcompizconfig/Manifest
+++ b/x11-libs/libcompizconfig/Manifest
@@ -1,7 +1,9 @@
+AUX libcompizconfig-0.8.2-allow-system-libiniparser.patch 1486 RMD160 f2834e73fb3d80a89e39e2d7faa17b9bceaa8e25 SHA1 72025a4dca771ca53ab79e4dce4b0b18b9a69f1e SHA256 c0052a0b9ba80039d5e641da4d35463e1f2b4327094a34fba79c9ee227347d60
 AUX libcompizconfig-undefinedref.patch 1204 RMD160 69538e32c526828d1e3d0ae6116f7b62a207edba SHA1 c97312c81ac6ac445d56599c10cf67418f0bd9db SHA256 27c3a644ea5b0b309ec32ed79f4a51f81ec2bc20cc9ccc73525237785052581d
 DIST libcompizconfig-0.6.0.tar.bz2 321353 RMD160 b38f9525878455534ebcc737b11521b49fb8f478 SHA1 53de25f2c3e3369840c4b8f49a163f8e3f6386a0 SHA256 32cec7f2c6d8af1d331afa1985ad14706c5c744b6e6e4656985e8b8793b8e5dc
 DIST libcompizconfig-0.8.2.tar.bz2 316234 RMD160 8e400a8089b9c6e90cd3850f79edd6d9d5581d92 SHA1 fa7b66466740021916d86bf447a37e489cc4395a SHA256 a373432c6bb80df4ef086b9ef82ac7cd70078a3040f6d06992980189b1bcc87b
 EBUILD libcompizconfig-0.6.0.ebuild 642 RMD160 1f50f3cec479ae1ac29845f058da3f49ec221301 SHA1 88d7b4c475a77952bfc224da3ec84fe25c3164a0 SHA256 9098f0843c3e722d6d5ac0043e94f21cf2cee578f05a756066b4d92afc1f75da
+EBUILD libcompizconfig-0.8.2-r1.ebuild 869 RMD160 cd01ed3b9b959067ca5d5cdbb95d3549d8b7ec80 SHA1 372682b487a0f4b5b5e3fd536a4215e592277e4f SHA256 23157d8a9eabc6f3a34954172d14df3de838154c58f13792da0f201e920f562e
 EBUILD libcompizconfig-0.8.2.ebuild 648 RMD160 b0b1846d5aa40b049e00335d8008a7c88f95ee54 SHA1 25581862881ac0b2ae6b7e49ea4e0240ab19a8a0 SHA256 d1ea8bc7d995f2d84b7ea4db050860fe9a4e511334e8c59b3a9ab5bff5050ad7
-MISC ChangeLog 2506 RMD160 721499cb770a652c8dc777d9b789f11ee063d261 SHA1 65877248e485abb3243efc50c144a2e1295f0609 SHA256 c64ebc08053d1993bfa237cc7723a685ea074a445792273b2ba513eb40b8b375
+MISC ChangeLog 2937 RMD160 66da5fe92f2cb8183214b98069f308b36b619fe1 SHA1 bc4ab664abfac7ebf6e80b8fe1d55b19634cc89a SHA256 39285db6d243a62d8f08a1392a6d95e00b666050c631e114d3981f613c583171
 MISC metadata.xml 280 RMD160 671d7dd693004475bf3af7780b37c468ce9c673f SHA1 2cc24314b85ae7ef3b5e90276066808abe898ae5 SHA256 f9f55fc620915629741a6fc06db6b36db36301a15f0214641b072b5bcfb76d2d
diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch
new file mode 100644
index 000000000000..852603ec00ce
--- /dev/null
+++ b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch
@@ -0,0 +1,44 @@
+diff -u -r libcompizconfig-0.8.2-old/configure.ac libcompizconfig-0.8.2/configure.ac
+--- libcompizconfig-0.8.2-old/configure.ac	2009-04-26 12:15:40.000000000 +0000
++++ libcompizconfig-0.8.2/configure.ac	2009-04-26 23:02:14.000000000 +0000
+@@ -116,6 +116,16 @@
+ fi
+ AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"])
+ 
++AC_ARG_WITH(internal-iniparser,
++  [AS_HELP_STRING([--without-internal-iniparser],[Don't use bundled iniparser lib])],
++  [], [with_internal_iniparser=yes])
++
++if test "x$with_internal_iniparser" = "xno"; then
++  AC_CHECK_LIB([iniparser], [iniparser_getnsec], [],
++    [AC_MSG_ERROR([Error! You need to have libiniparser])])
++fi
++AM_CONDITIONAL([WITH_INTERNAL_INIPARSER], [test "x$with_internal_iniparser" = "xyes"])
++
+ AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes], [have_inotify=no])
+ 
+ AC_ARG_ENABLE(debug,
+diff -u -r libcompizconfig-0.8.2-old/src/Makefile.am libcompizconfig-0.8.2/src/Makefile.am
+--- libcompizconfig-0.8.2-old/src/Makefile.am	2009-04-26 12:15:39.000000000 +0000
++++ libcompizconfig-0.8.2/src/Makefile.am	2009-04-26 23:00:37.000000000 +0000
+@@ -39,14 +39,17 @@
+ 	lists.c 	\
+ 	compiz.cpp 	\
+ 	config.c 	\
+-	iniparser.c 	\
+ 	ini.c 		\
+ 	bindings.c 	\
+ 	filewatch.c 	\
+-	ccs-private.h	\
+-	iniparser.h
++	ccs-private.h
+ 
+ libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB)
+ 
+ lib_LTLIBRARIES=libcompizconfig.la
+ 
++if WITH_INTERNAL_INIPARSER
++
++  libcompizconfig_la_SOURCES += iniparser.h iniparser.c
++
++endif
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r1.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..909d8fdda886
--- /dev/null
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r1.ebuild,v 1.1 2009/04/27 02:02:32 jmbsvicetto Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="Compiz Configuration System (git)"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	~x11-wm/compiz-${PV}"
+DEPEND="${RDEPEND}
+	dev-libs/iniparser
+	dev-util/intltool
+	>=dev-util/pkgconfig-0.19"
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${P}-allow-system-libiniparser.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-internal-iniparser \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}