Added libcompizconfig-0.8.2-r2 from the overlay - thanks to John Keeping for the patch.

Fixes bug 259715.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 219 insertions, 12 deletions

diff --git a/x11-libs/libcompizconfig/ChangeLog b/x11-libs/libcompizconfig/ChangeLog
index 2f7ae5beed46..3fa18aa5462e 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.17 2009/04/27 02:02:32 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/ChangeLog,v 1.18 2009/07/16 18:12:21 jmbsvicetto Exp $
+
+*libcompizconfig-0.8.2-r2 (16 Jul 2009)
+
+  16 Jul 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -libcompizconfig-0.8.2-r1.ebuild, +libcompizconfig-0.8.2-r2.ebuild,
+  files/libcompizconfig-0.8.2-allow-system-libiniparser.patch:
+  Added libcompizconfig-0.8.2-r2 from the overlay - thanks to John Keeping
+  for the patch.
+  Fixes bug 259715.
 
   27 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +files/libcompizconfig-0.8.2-allow-system-libiniparser.patch,
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
index 42f4ee3520d4..d6a8e745c2dc 100644
--- a/x11-libs/libcompizconfig/Manifest
+++ b/x11-libs/libcompizconfig/Manifest
@@ -1,9 +1,9 @@
-AUX libcompizconfig-0.8.2-allow-system-libiniparser.patch 1486 RMD160 f2834e73fb3d80a89e39e2d7faa17b9bceaa8e25 SHA1 72025a4dca771ca53ab79e4dce4b0b18b9a69f1e SHA256 c0052a0b9ba80039d5e641da4d35463e1f2b4327094a34fba79c9ee227347d60
+AUX libcompizconfig-0.8.2-allow-system-libiniparser.patch 6993 RMD160 cbbc8b04653a1175ce299d63974d22ca739f4cab SHA1 678634c48f8543ee26c54ec9a404b619657257e3 SHA256 4a6511605a6d6a6a45b528a344e2a79fd9e5b98cd8bbc0a94c3257fec44cce76
 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-r2.ebuild 1030 RMD160 2aaa57817b48e1b3fdb3611ad4a579d3827ce518 SHA1 75dea926d90dbfa88bf333a6cf992c390e3f5dfe SHA256 ade6e56e7a89ceac85133556feaa4af9f8bc748da3d01e092cfa76257e036874
 EBUILD libcompizconfig-0.8.2.ebuild 648 RMD160 b0b1846d5aa40b049e00335d8008a7c88f95ee54 SHA1 25581862881ac0b2ae6b7e49ea4e0240ab19a8a0 SHA256 d1ea8bc7d995f2d84b7ea4db050860fe9a4e511334e8c59b3a9ab5bff5050ad7
-MISC ChangeLog 2937 RMD160 66da5fe92f2cb8183214b98069f308b36b619fe1 SHA1 bc4ab664abfac7ebf6e80b8fe1d55b19634cc89a SHA256 39285db6d243a62d8f08a1392a6d95e00b666050c631e114d3981f613c583171
+MISC ChangeLog 3291 RMD160 c039a0d28791b2d2b2769f74f21d66ba3f0785e0 SHA1 95ba301309e9a8d41c2b183411c607dd62acdc3e SHA256 8c577f105f75fc63829f808e829ce36aac7f09a103b5dc1040c97ac982c73225
 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
index 852603ec00ce..3028faf967ad 100644
--- 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
@@ -1,6 +1,19 @@
-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
+diff -Naur libcompizconfig-0.8.2.orig/config.h.in libcompizconfig-0.8.2/config.h.in
+--- libcompizconfig-0.8.2.orig/config.h.in	2009-03-05 15:29:12.000000000 +0000
++++ libcompizconfig-0.8.2/config.h.in	2009-05-02 14:55:48.000000000 +0100
+@@ -30,6 +30,9 @@
+ /* Define if your <locale.h> file defines LC_MESSAGES. */
+ #undef HAVE_LC_MESSAGES
+ 
++/* Define to 1 if you have the `iniparser' library (-liniparser). */
++#undef HAVE_LIBINIPARSER
++
+ /* Define to 1 if you have the `protobuf' library (-lprotobuf). */
+ #undef HAVE_LIBPROTOBUF
+ 
+diff -Naur libcompizconfig-0.8.2.orig/configure.ac libcompizconfig-0.8.2/configure.ac
+--- libcompizconfig-0.8.2.orig/configure.ac	2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/configure.ac	2009-05-02 14:55:48.000000000 +0100
 @@ -116,6 +116,16 @@
  fi
  AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"])
@@ -18,9 +31,35 @@ diff -u -r libcompizconfig-0.8.2-old/configure.ac libcompizconfig-0.8.2/configur
  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
+diff -Naur libcompizconfig-0.8.2.orig/include/ccs.h libcompizconfig-0.8.2/include/ccs.h
+--- libcompizconfig-0.8.2.orig/include/ccs.h	2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/include/ccs.h	2009-05-02 14:55:48.000000000 +0100
+@@ -695,19 +695,9 @@
+ 
+ /* INI file stuff */
+ 
+-typedef struct _dictionary_
+-{
+-    /** Number of entries in dictionary */
+-    int n;
+-    /** Storage size */
+-    int size;
+-    /** List of string values */
+-    char **val;
+-    /** List of string keys */
+-    char **key ;
+-    /** List of hash values for keys */
+-    unsigned *hash;
+-} IniDictionary;
++#include <iniparser.h>
++
++typedef dictionary IniDictionary;
+ 
+ IniDictionary* ccsIniNew (void);
+ IniDictionary* ccsIniOpen (const char *fileName);
+diff -Naur libcompizconfig-0.8.2.orig/src/Makefile.am libcompizconfig-0.8.2/src/Makefile.am
+--- libcompizconfig-0.8.2.orig/src/Makefile.am	2009-03-05 15:28:59.000000000 +0000
++++ libcompizconfig-0.8.2/src/Makefile.am	2009-05-02 14:55:48.000000000 +0100
 @@ -39,14 +39,17 @@
  	lists.c 	\
  	compiz.cpp 	\
@@ -42,3 +81,159 @@ diff -u -r libcompizconfig-0.8.2-old/src/Makefile.am libcompizconfig-0.8.2/src/M
 +  libcompizconfig_la_SOURCES += iniparser.h iniparser.c
 +
 +endif
+diff -Naur libcompizconfig-0.8.2.orig/src/ini.c libcompizconfig-0.8.2/src/ini.c
+--- libcompizconfig-0.8.2.orig/src/ini.c	2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/src/ini.c	2009-05-02 14:56:12.000000000 +0100
+@@ -23,9 +23,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <errno.h>
++#include <ctype.h>
+ 
+ #include <ccs.h>
+-#include "iniparser.h"
++#include <iniparser.h>
+ 
+ /** 
+  * Creates the parent directory for @fileName, recursively creating a directory
+@@ -77,7 +78,7 @@
+     if (file)
+ 	fclose (file);
+ 
+-    return iniparser_new ((char*) fileName);
++    return iniparser_load ((char*) fileName);
+ }
+ 
+ IniDictionary*
+@@ -89,17 +90,22 @@
+ void
+ ccsIniClose (IniDictionary *dictionary)
+ {
+-    iniparser_free (dictionary);
++    iniparser_freedict (dictionary);
+ }
+ 
+ void
+ ccsIniSave (IniDictionary *dictionary,
+ 	    const char    *fileName)
+ {
++    FILE *f;
+     if (!ccsCreateDirFor (fileName))
+ 	return;
+ 
+-    iniparser_dump_ini (dictionary, fileName);
++    f = fopen(fileName, "w");
++    if(!f)
++        return;
++    iniparser_dump_ini (dictionary, f);
++    fclose(f);
+ }
+ 
+ static char*
+@@ -127,11 +133,11 @@
+     char *sectionName;
+ 
+     asprintf (&sectionName, "%s:%s", section, entry);
+-
++/*
+     if (!iniparser_find_entry (dictionary, (char*) section))
+ 	iniparser_add_entry (dictionary, (char*) section, NULL, NULL);
+-
+-    iniparser_setstr (dictionary, sectionName, (char*) value);
++*/
++    iniparser_set (dictionary, sectionName, (char*) value);
+ 
+     free (sectionName);
+ }
+diff -Naur libcompizconfig-0.8.2.orig/src/iniparser.h libcompizconfig-0.8.2/src/iniparser.h
+--- libcompizconfig-0.8.2.orig/src/iniparser.h	2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/src/iniparser.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,65 +0,0 @@
+-/*
+- Based upon libiniparser, by Nicolas Devillard
+- Hacked into 1 file (m-iniparser) by Freek/2005
+- Original terms following:
+-
+- -- -
+-
+- Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr).
+-
+- Written by Nicolas Devillard. Not derived from licensed software.
+-
+- Permission is granted to anyone to use this software for any
+- purpose on any computer system, and to redistribute it freely,
+- subject to the following restrictions:
+-
+- 1. The author is not responsible for the consequences of use of
+- this software, no matter how awful, even if they arise
+- from defects in it.
+-
+- 2. The origin of this software must not be misrepresented, either
+- by explicit claim or by omission.
+-
+- 3. Altered versions must be plainly marked as such, and must not
+- be misrepresented as being the original software.
+-
+- 4. This notice may not be removed or altered.
+-
+- */
+-
+-
+-#ifndef _INIPARSER_H_
+-#define _INIPARSER_H_
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <unistd.h>
+-#include <ctype.h>
+-
+-#include <ccs.h>
+-
+-typedef IniDictionary dictionary;
+-
+-typedef struct _FileLock
+-{
+-	int fd;
+-} FileLock;
+-
+-/* generated by genproto */
+-
+-dictionary * iniparser_new(char *ininame);
+-dictionary * dictionary_new(int size);
+-void iniparser_free(dictionary * d);
+-
+-
+-int iniparser_getnsec(dictionary * d);
+-char * iniparser_getsecname(dictionary * d, int n);
+-void iniparser_dump_ini(dictionary * d, const char * file_name);
+-char * iniparser_getstring(dictionary * d, char * key, char * def);
+-void iniparser_add_entry(dictionary * d, char * sec, char * key, char * val);
+-int iniparser_find_entry(dictionary  *   ini, char        *   entry);
+-int iniparser_setstr(dictionary * ini, char * entry, char * val);
+-void iniparser_unset(dictionary * ini, char * entry);
+-
+-#endif
+-
+diff -Naur libcompizconfig-0.8.2.orig/src/main.c libcompizconfig-0.8.2/src/main.c
+--- libcompizconfig-0.8.2.orig/src/main.c	2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/src/main.c	2009-05-02 14:56:26.000000000 +0100
+@@ -34,9 +34,9 @@
+ #include <math.h>
+ 
+ #include <ccs.h>
++#include <iniparser.h>
+ 
+ #include "ccs-private.h"
+-#include "iniparser.h"
+ 
+ Bool basicMetadata = FALSE;
+ 
+@@ -2577,7 +2577,7 @@
+ 	return FALSE;
+     fclose (fp);
+ 
+-    importFile = iniparser_new ((char *) fileName);
++    importFile = iniparser_load ((char *) fileName);
+     if (!importFile)
+ 	return FALSE;
+ 
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r1.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r2.ebuild
index 909d8fdda886..e445c635510b 100644
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r1.ebuild
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/libcompizconfig-0.8.2-r2.ebuild,v 1.1 2009/07/16 18:12:21 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -18,12 +18,15 @@ IUSE=""
 RDEPEND="dev-libs/libxml2
 	~x11-wm/compiz-${PV}"
 DEPEND="${RDEPEND}
-	dev-libs/iniparser
+	>=dev-libs/iniparser-3.0b-r1
 	dev-util/intltool
 	>=dev-util/pkgconfig-0.19"
 
 src_prepare() {
 
+#	rm "${S}/src/iniparser.h" || die "Failed to remove ${S}/src/iniparser.h"
+#	rm "${S}/src/iniparser.c" || die "Failed to remove ${S}/src/iniparser.c"
+
 	epatch "${FILESDIR}/${P}-allow-system-libiniparser.patch"
 	eautoreconf
 }