diff --git a/dev-libs/confuse/ChangeLog b/dev-libs/confuse/ChangeLog --- a/dev-libs/confuse/ChangeLog +++ b/dev-libs/confuse/ChangeLog @@ -1,7 +1,16 @@ # ChangeLog for dev-libs/confuse -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.39 2008/12/17 22:09:10 maekke Exp $ + 22 Feb 2010; Nathan Phillip Brink (ohnobinki) + -confuse-2.6-r3.ebuild, + -confuse-2.6-r4.ebuild, -files/confuse-2.6-O0.patch, + -files/confuse-2.6-noexamples.patch, + -files/confuse-2.6-relativeincludes.patch, + -files/confuse-2.6-solaris.patch, +confuse-2.7.ebuild: + Bump to confuse-2.7 which doesn't need any patches so far, thanks to + flameeyes. Remove my pointless relativeincludes patch. + 03 Aug 2009; Nathan Brink confuse-2.6-r4.ebuild: Force regeneration of flex.c. diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest --- a/dev-libs/confuse/Manifest +++ b/dev-libs/confuse/Manifest @@ -1,9 +1,4 @@ -AUX confuse-2.6-O0.patch 492 RMD160 29fd2ba5a9c2fec7d23f1586b25de4fdda30e720 SHA1 1a6c59611dd013e429e44ebf886a60e0a30ecec1 SHA256 64a6d0df44f72d3f514a4678a16f1f887e417250f7990b64631fe0a3999215ff -AUX confuse-2.6-noexamples.patch 1097 RMD160 77dc01c65b1f7c00e4d460ab8feb15af88bf4685 SHA1 eb278dfb91a3c707517acc3772b08eb198ff4d23 SHA256 860b1459e499588186d5b0e0d8e614ffe160ff935dd3a4db461a1b9071df90f7 -AUX confuse-2.6-relativeincludes.patch 1562 RMD160 099b59694450e377fe057bed1b6150cde1dac24f SHA1 fb53dce15875c34d081cfbb6accf97cf88ba73c8 SHA256 17f23a048492fa6b038c7ec114fb6d477cfc411eefc88ffcc2c7b28dbf460a84 -AUX confuse-2.6-solaris.patch 572 RMD160 e43927f1688fb99e283d919b4d6f7bce7de18bb2 SHA1 bbe8a4071c8961b965cd37f2ce9b295ff17129dc SHA256 00dc757a617db9fc5832ec4435ef581b49286621cf300a89b318151a1bfd15c5 -DIST confuse-2.6.tar.gz 504017 RMD160 11f987089c533573482a427c7ad2ae8e155389b7 SHA1 e9e5510abf1eb3159a6439fd52aa5cec94811aff SHA256 e8d653159b152f3850a7224b3eb604955795dbd3fd6603816ee46411ea53e84a -EBUILD confuse-2.6-r3.ebuild 1191 RMD160 033c7062f7ce617aef42b19294c1024b3af138f9 SHA1 91574a27afc4cd0d5a31d0e777089c01951daf11 SHA256 7c1b910922cac96acfaa0a90eab55661071dcc382ffcb9529ae7730e74afb5c7 -EBUILD confuse-2.6-r4.ebuild 1648 RMD160 dceb82a73044d736895971785a03a09b01aa31a2 SHA1 492467e1a504c600986fccc0673d0b79c66c30d2 SHA256 ece418ea41998baca1cbfa3224405d892730974ac420c200bc421f783035b680 -MISC ChangeLog 5422 RMD160 b78a30efeef620a2c606c41a26ea04fb7f2fdbe7 SHA1 d2325f74c1a0a06dc9aed2dd7a9b4e3417a0a4a7 SHA256 1d8b7931cfe0cdec4ed980844027f3d4d5da799930ec0aae1e21d18ffe8452d8 +DIST confuse-2.7.tar.gz 517272 RMD160 adff129b2fd078b0e233386541dd83f7b0c567a4 SHA1 b3f74f9763e6c9012476dbd323d083af4be34cad SHA256 e32574fd837e950778dac7ade40787dd2259ef8e28acd6ede6847ca895c88778 +EBUILD confuse-2.7.ebuild 936 RMD160 d94e4d9abf617a1ff2d21456df451e107afb7ec0 SHA1 d7f2939faa84bce18948d38ccb07ccb943254807 SHA256 0728f1bf668deedc765ef7f30a5ad596256b2f11d0222cf54c5c6fc004a58123 +MISC ChangeLog 5852 RMD160 2abc0e9e9103feae8b94b56391f717e5236bb5b3 SHA1 74742d1c32e2198f3720fb1e038f57b2aad01bfc SHA256 f3dbf5a0d663ecc78d280118cc4e9dfc03ff90d4845cbe39e7ad9db153db3613 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337 diff --git a/dev-libs/confuse/confuse-2.6-r3.ebuild b/dev-libs/confuse/confuse-2.6-r3.ebuild deleted file mode 100644 --- a/dev-libs/confuse/confuse-2.6-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r3.ebuild,v 1.6 2008/12/17 22:09:10 maekke Exp $ - -inherit eutils autotools - -DESCRIPTION="a configuration file parser library" -HOMEPAGE="http://www.nongnu.org/confuse/" -SRC_URI="http://bzero.se/confuse/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="nls" - -DEPEND="sys-devel/flex - sys-devel/libtool - dev-util/pkgconfig - nls? ( sys-devel/gettext )" -RDEPEND="nls? ( virtual/libintl )" - -src_unpack() { - unpack ${A} - cd "${S}" - # bug #236347 - epatch "${FILESDIR}"/${P}-O0.patch - # bug 239020 - epatch "${FILESDIR}"/${P}-solaris.patch - # don't compile examples: - epatch "${FILESDIR}"/${P}-noexamples.patch - # drop -Werror, bug #208095 - sed -i -e 's/-Werror//' */Makefile.* || die - - eautoreconf -} - -src_compile() { - econf --enable-shared --disable-examples || die - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - doman doc/man/man3/*.3 - dodoc AUTHORS NEWS README - dodoc examples/*.c examples/*.conf - dohtml doc/html/* || die -} diff --git a/dev-libs/confuse/confuse-2.6-r4.ebuild b/dev-libs/confuse/confuse-2.6-r4.ebuild deleted file mode 100644 --- a/dev-libs/confuse/confuse-2.6-r4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r3.ebuild,v 1.6 2008/12/17 22:09:10 maekke Exp $ - -inherit eutils autotools - -DESCRIPTION="a configuration file parser library" -HOMEPAGE="http://www.nongnu.org/confuse/" -SRC_URI="http://bzero.se/confuse/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="nls" - -DEPEND="sys-devel/flex - sys-devel/libtool - dev-util/pkgconfig - nls? ( sys-devel/gettext )" -RDEPEND="nls? ( virtual/libintl )" - -pkg_setup() { - ewarn "This copy of confuse has a patch that causes cfg_include" - ewarn "to include files relative to the file calling cfg_include." - ewarn "This may break packages designed for vanilla confuse. Please" - ewarn "bug me at https://ohnopublishing.net/bugs/ if you have problems" - ewarn "with this." -} - -src_unpack() { - unpack ${A} - cd "${S}" - # bug #236347 - epatch "${FILESDIR}"/${P}-O0.patch - # bug 239020 - epatch "${FILESDIR}"/${P}-solaris.patch - # don't compile examples: - epatch "${FILESDIR}"/${P}-noexamples.patch - - #relative cfg_include()s - epatch "${FILESDIR}"/${P}-relativeincludes.patch - #force regeneration of lexer.c - rm src/lexer.c - - # drop -Werror, bug #208095 (in confuse-2.7) - sed -i -e 's/-Werror//' */Makefile.* || die - - eautoreconf -} - -src_compile() { - econf --enable-shared --disable-examples || die - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - doman doc/man/man3/*.3 - dodoc AUTHORS NEWS README - dodoc examples/*.c examples/*.conf - dohtml doc/html/* || die -} diff --git a/dev-libs/confuse/confuse-2.7.ebuild b/dev-libs/confuse/confuse-2.7.ebuild new file mode 100644 --- /dev/null +++ b/dev-libs/confuse/confuse-2.7.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r3.ebuild,v 1.6 2008/12/17 22:09:10 maekke Exp $ + +EAPI="2" + +DESCRIPTION="a configuration file parser library" +HOMEPAGE="http://www.nongnu.org/confuse/" +SRC_URI="mirror://nongnu/confuse/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +DEPEND="sys-devel/flex + dev-util/pkgconfig + sys-devel/gettext" +RDEPEND="virtual/libintl" + +src_configure() { + # examples are compiled but not installed. They + # fail during a mingw crosscompile. + econf --enable-shared \ + --disable-examples +} + +src_install() { + emake DESTDIR="${D}" install || die + + doman doc/man/man3/*.3 || die + dodoc AUTHORS NEWS README || die + dohtml doc/html/* || die + + insinto /usr/share/doc/${PF} + doins examples/*.c || die +} diff --git a/dev-libs/confuse/files/confuse-2.6-O0.patch b/dev-libs/confuse/files/confuse-2.6-O0.patch deleted file mode 100644 --- a/dev-libs/confuse/files/confuse-2.6-O0.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/confuse.c -=================================================================== -RCS file: /sources/confuse/confuse/src/confuse.c,v -retrieving revision 1.36 -diff -u -B -r1.36 confuse.c ---- src/confuse.c 13 Oct 2007 20:01:45 -0000 1.36 -+++ src/confuse.c 1 Sep 2008 11:57:30 -0000 -@@ -41,6 +41,7 @@ - #define is_set(f, x) (((f) & (x)) == (f)) - - #if defined(ENABLE_NLS) && defined(HAVE_GETTEXT) -+# include - # include - # define _(str) dgettext(PACKAGE, str) - #else diff --git a/dev-libs/confuse/files/confuse-2.6-noexamples.patch b/dev-libs/confuse/files/confuse-2.6-noexamples.patch deleted file mode 100644 --- a/dev-libs/confuse/files/confuse-2.6-noexamples.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru /var/tmp/portage/dev-libs/confuse-2.6-r3/work/confuse-2.6/Makefile.am ./Makefile.am ---- ./Makefile.am 2007-10-13 16:39:59.000000000 -0400 -+++ ./Makefile.am 2009-02-28 22:27:06.000000000 -0500 -@@ -3,7 +3,11 @@ - AUTOMAKE_OPTIONS = foreign - CLEANFILES=*~ '\#*\#' - EXTRA_DIST=libconfuse.spec.in libconfuse.spec --SUBDIRS = m4 po src examples tests doc -+ -+if ENABLE_EXAMPLES -+ EXAMPLES = examples -+endif -+SUBDIRS = m4 po src $(EXAMPLES) tests doc - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libconfuse.pc -diff -ru /var/tmp/portage/dev-libs/confuse-2.6-r3/work/confuse-2.6/configure.ac ./configure.ac ---- ./configure.ac 2009-02-28 20:54:04.000000000 -0500 -+++ ./configure.ac 2009-02-28 22:26:38.000000000 -0500 -@@ -24,6 +24,12 @@ - AC_DISABLE_SHARED - AC_PROG_LIBTOOL - -+#optional building of examples: -+AC_ARG_ENABLE(examples, -+ AC_HELP_STRING([--disable-examples], [don't build examples in examples]), -+ [], [enable_examples=yes]) -+ -+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "$enable_examples" = yes]) - AM_CONDITIONAL([cc_is_gcc], test "$GCC" = "yes") - - AM_GNU_GETTEXT([external]) diff --git a/dev-libs/confuse/files/confuse-2.6-relativeincludes.patch b/dev-libs/confuse/files/confuse-2.6-relativeincludes.patch deleted file mode 100644 --- a/dev-libs/confuse/files/confuse-2.6-relativeincludes.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/src/lexer.l -+++ b/src/lexer.l -@@ -298,12 +298,51 @@ int cfg_lexer_include(cfg_t *cfg, const char *filename) - cfg_include_stack[cfg_include_stack_ptr].line = cfg->line; - cfg_include_stack_ptr++; - -- xfilename = cfg_tilde_expand(filename); -+ xfilename = NULL; -+ -+ if(filename[0] != '/' -+ && filename[0] != '~' -+ /* ensure that the existing file has directories in it */ -+#ifdef _WIN32 -+ && (strchr(cfg->filename, '\\') -+ || strchr(cfg->filename, '/')) -+#else -+ && cfg->filename[0] == '/' -+#endif -+ ) -+ /* then this path is relative to the file it was included from */ -+ { -+ char *lastslash; -+ size_t prefixlen; -+ -+ lastslash = strrchr(cfg->filename, '/'); -+#ifdef _WIN32 -+ { -+ char *win32slash; -+ -+ win32slash = strrchr(cfg->filename, '\\'); -+ if(!lastslash -+ || win32slash > lastslash) -+ lastslash = win32slash; -+ } -+#endif -+ assert(lastslash); -+ prefixlen = lastslash - cfg->filename + 1; /* length of prefix including slash */ -+ xfilename = malloc(prefixlen -+ + strlen(filename) -+ + 1); /* NULL terminator */ -+ assert(xfilename); -+ strncpy(xfilename, cfg->filename, prefixlen); -+ strcpy(xfilename + prefixlen, filename); -+ } -+ -+ if(!xfilename) -+ xfilename = cfg_tilde_expand(filename); - - cfg_yyin = fopen(xfilename, "r"); - - if(!cfg_yyin) { -- cfg_error(cfg, "%s: %s", xfilename, strerror(errno)); -+ cfg_error(cfg, "%s (expanded from %s): %s", xfilename, filename, strerror(errno)); - free(xfilename); - return 1; - } diff --git a/dev-libs/confuse/files/confuse-2.6-solaris.patch b/dev-libs/confuse/files/confuse-2.6-solaris.patch deleted file mode 100644 --- a/dev-libs/confuse/files/confuse-2.6-solaris.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: configure.ac -=================================================================== -RCS file: /sources/confuse/confuse/configure.ac,v -retrieving revision 1.18 -diff -u -B -r1.18 configure.ac ---- configure.ac 13 Oct 2007 15:02:52 -0000 1.18 -+++ configure.ac 29 Sep 2008 10:13:10 -0000 -@@ -39,6 +39,9 @@ - # Checks for library functions. - AC_CHECK_FUNCS([strcasecmp strdup strndup]) - -+dnl Check for the library containing inet_aton/inet_ntoa (for tests) -+AC_SEARCH_LIBS([inet_ntoa], [socket nsl]) -+ - AC_CONFIG_FILES([Makefile \ - src/Makefile \ - examples/Makefile \