Added sys-devel/flex to DEPEND, bug #221379.

Package-Manager: portage-2.1.5_rc6

7 files changed, 16 insertions, 111 deletions

diff --git a/dev-libs/confuse/ChangeLog b/dev-libs/confuse/ChangeLog
index 210e739b54a6..bdbdf2b00b05 100644
--- a/dev-libs/confuse/ChangeLog
+++ b/dev-libs/confuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/confuse
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.31 2008/05/12 16:22:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.32 2008/05/17 03:07:07 matsuu Exp $
+
+  17 May 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/confuse-2.5-libintl.patch, -files/confuse-2.5-maketest.patch,
+  -confuse-2.5.ebuild, confuse-2.6.ebuild, confuse-2.6-r1.ebuild:
+  Added sys-devel/flex to DEPEND, bug #221379.
+  Removed old version.
 
   12 May 2008; Markus Meier <maekke@gentoo.org> confuse-2.6.ebuild:
   amd64 stable, bug #217815
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 9f4e740f2a94..402a7cd7105c 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,19 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX confuse-2.5-libintl.patch 322 RMD160 33d1b75e745b935c85493d6e8baa0878f671a22b SHA1 6e95340cd14aa2bddb7388289feba528c33a616c SHA256 6480a551fcc868205152e4459bdcda8b5aa8aa877a956c3a005b7af89535a729
-AUX confuse-2.5-maketest.patch 581 RMD160 4be7e8c57f29fbd97e8c26d7885be32f2ae26c8f SHA1 170a457a906f4b940977fe34220d7cdcc9ffe4f8 SHA256 2ea10b5ae544e3c0c13222b9c1dc9a2a66f1493456aff2cacb45f9b3c539727c
-DIST confuse-2.5.tar.gz 502501 RMD160 25314942e740bb4c7e90dc9860df4df73f8ffc07 SHA1 0ba87baeb0f6540414b24c4b2d47ae375d0b870d SHA256 65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
 DIST confuse-2.6.tar.gz 504017 RMD160 11f987089c533573482a427c7ad2ae8e155389b7 SHA1 e9e5510abf1eb3159a6439fd52aa5cec94811aff SHA256 e8d653159b152f3850a7224b3eb604955795dbd3fd6603816ee46411ea53e84a
-EBUILD confuse-2.5.ebuild 1409 RMD160 bd294f09ecd48f39bddda369873d0646fca60f2d SHA1 65eb76e5b899dd2fd3325b94893b3a74096c1310 SHA256 528943ad1aaab746b207619d68f2f1ac0893ba151776e149bc6bc5023d97317e
-EBUILD confuse-2.6-r1.ebuild 904 RMD160 88d784ba8ab6d280ed3ecf250f91d695377fb80d SHA1 e4b8610f49b96071cd79b404b6d851d2252dbd41 SHA256 be94e2c65630e2a669d32a0c4a913acf40f2b1b3b31e453f510a61b5baa25e4d
-EBUILD confuse-2.6.ebuild 803 RMD160 08d8586df772f36c5cff463685ef108b1281a180 SHA1 9f5c6e3a3370f6431c324511bf35ee98302c245e SHA256 227667ca68cbe1cad27f937dc33491bd1cfe3a4ed95afd6d4ab943e2e461f0c8
-MISC ChangeLog 3715 RMD160 0dcea6e3846d89fbde41f2de3fd41cbe26360ef1 SHA1 12c67402ea35890d8b0bcbf786e8fba4ed3dc16c SHA256 1c7177ac9ea3fc9e8e330bae3e681f66c07390becc0c15d4f68a573685ee3337
+EBUILD confuse-2.6-r1.ebuild 920 RMD160 1a0a0614224961e1330ba42598c29f2d43dbf976 SHA1 089b7dc625bcdec328d908ece9536af6bc61ab19 SHA256 ef30bed8430d723dcddbdeb575f3950a23a0acea765ce843f0546c3b6f5c958d
+EBUILD confuse-2.6.ebuild 819 RMD160 bbf93fd148a905484c1536a5948fe081cb31b537 SHA1 d7436dd05ac2852d4299b022fe70a835beba13f9 SHA256 883cf1aa30b568eb87b7eabb390b29e2f161e8586dd6641638794ff555d1f046
+MISC ChangeLog 3972 RMD160 023bc443b9333664d4a847c1a6230e5f7513cf1d SHA1 7ca3badc7b8be52c024f629ad381898404d48325 SHA256 b7f725051efd6c8381b4338070210f290503668757bad1b2725c42328c187f56
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgobvUACgkQkKaRLQcq0GKYFgCfbCbbIzqr8+03SI3x91b1fW0H
-v4MAn0faIdboTEkKYw6+jH8jV8BFuSp2
-=UPTD
------END PGP SIGNATURE-----
diff --git a/dev-libs/confuse/confuse-2.5.ebuild b/dev-libs/confuse/confuse-2.5.ebuild
deleted file mode 100644
index c4ed1448098b..000000000000
--- a/dev-libs/confuse/confuse-2.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.5.ebuild,v 1.26 2007/09/14 17:37:03 mr_bones_ Exp $
-
-WANT_AUTOMAKE="1.8"
-
-inherit eutils libtool autotools
-
-DESCRIPTION="a configuration file parser library"
-HOMEPAGE="http://www.nongnu.org/confuse/"
-SRC_URI="http://savannah.nongnu.org/download/confuse/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc debug nls test"
-
-DEPEND="sys-devel/libtool
-	dev-util/pkgconfig
-	test? ( dev-libs/check )
-	doc? ( app-text/openjade
-		>=app-text/docbook-sgml-dtd-3.1-r1 )"
-RDEPEND=""
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-maketest.patch
-
-	# We should link to libintl correctly
-	epatch "${FILESDIR}"/${P}-libintl.patch
-
-	eautomake
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	use debug \
-		&& myconf="${myconf} --enable-debug=all" \
-		|| myconf="${myconf} --disable-debug"
-
-	econf \
-		--enable-shared \
-		$(use_enable doc build-docs) \
-		$(use_enable nls) \
-		${myconf} || die
-	emake || die
-}
-
-src_test() {
-	cd "${S}"/tests
-	./check_confuse || die "self test failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-	dobin confuse-config
-	if use doc ; then
-		dohtml doc/html/*.html || die
-	fi
-	rmdir "${D}"/usr/bin
-}
diff --git a/dev-libs/confuse/confuse-2.6-r1.ebuild b/dev-libs/confuse/confuse-2.6-r1.ebuild
index 8cc50b064e22..2edb43c46e31 100644
--- a/dev-libs/confuse/confuse-2.6-r1.ebuild
+++ b/dev-libs/confuse/confuse-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2008/04/15 16:22:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r1.ebuild,v 1.2 2008/05/17 03:07:07 matsuu Exp $
 
 DESCRIPTION="a configuration file parser library"
 HOMEPAGE="http://www.nongnu.org/confuse/"
@@ -11,7 +11,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="nls"
 
-DEPEND="sys-devel/libtool
+DEPEND="sys-devel/flex
+	sys-devel/libtool
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/confuse/confuse-2.6.ebuild b/dev-libs/confuse/confuse-2.6.ebuild
index 247cfe2a04bc..5974e9655eb0 100644
--- a/dev-libs/confuse/confuse-2.6.ebuild
+++ b/dev-libs/confuse/confuse-2.6.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.8 2008/05/12 16:22:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6.ebuild,v 1.9 2008/05/17 03:07:07 matsuu Exp $
 
 DESCRIPTION="a configuration file parser library"
 HOMEPAGE="http://www.nongnu.org/confuse/"
@@ -11,7 +11,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="nls"
 
-DEPEND="sys-devel/libtool
+DEPEND="sys-devel/flex
+	sys-devel/libtool
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/confuse/files/confuse-2.5-libintl.patch b/dev-libs/confuse/files/confuse-2.5-libintl.patch
deleted file mode 100644
index 60192292c8f6..000000000000
--- a/dev-libs/confuse/files/confuse-2.5-libintl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am	2004-10-02 16:25:13 +0100
-+++ b/src/Makefile.am	2007-09-13 10:48:44 +0100
-@@ -2,6 +2,7 @@
- 
- libconfuse_la_SOURCES = confuse.c lexer.l
- include_HEADERS = confuse.h
-+libconfuse_la_LIBADD = $(LTLIBINTL)
- 
- datadir = @datadir@
- localedir = $(datadir)/locale
diff --git a/dev-libs/confuse/files/confuse-2.5-maketest.patch b/dev-libs/confuse/files/confuse-2.5-maketest.patch
deleted file mode 100644
index a7acc29d6eb0..000000000000
--- a/dev-libs/confuse/files/confuse-2.5-maketest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tests/Makefile.am.orig	2004-12-05 11:48:41.870585648 +0930
-+++ tests/Makefile.am	2004-12-05 11:49:22.118467040 +0930
-@@ -2,8 +2,8 @@
- EXTRA_PROGRAMS=check_confuse
- check_confuse_SOURCES=check_confuse.c suite_single.c suite_dup.c suite_list.c suite_validate.c \
- 					  suite_func.c
--check_confuse_INCLUDES=-I$(top_srcdir)/src @CHECK_CFLAGS@
--check_confuse_LDADD=-L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL)
-+INCLUDES=-I$(top_srcdir)/src @CHECK_CFLAGS@
-+LDADD=-L../src/ @CHECK_LIBS@ ../src/libconfuse.la $(LTLIBINTL)
- EXTRA_DIST=a.conf b.conf
- CLEANFILES=*~ \#*\#
-