old

Package-Manager: portage-2.1.3_rc9

6 files changed, 7 insertions, 188 deletions

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 02fdd60b12bf..ce9b74211abf 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,22 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX flex-2.5.31-check-for-locale-header.patch 1011 RMD160 5812d387e982f8a00ddb5a82c5d53a968fb3d682 SHA1 b6c4adde5f325b118e7fb59135e452cfd594be6c SHA256 67196ce234c5edabd0652f0888ab58503e6f8e10a023fa72f894ca19be7deab7
-MD5 2f1f506c1cba186162e0d8a21fbb93d1 files/flex-2.5.31-check-for-locale-header.patch 1011
-RMD160 5812d387e982f8a00ddb5a82c5d53a968fb3d682 files/flex-2.5.31-check-for-locale-header.patch 1011
-SHA256 67196ce234c5edabd0652f0888ab58503e6f8e10a023fa72f894ca19be7deab7 files/flex-2.5.31-check-for-locale-header.patch 1011
-AUX flex-2.5.31-gnu-m4.patch 1028 RMD160 346124df8e0ce5d17c6743a24c69bd1d306ca2d2 SHA1 f42f7fa7b54ca9971d7cbae5c3ebaf76ce4e59c0 SHA256 d82107aed35cccb455c27335682facc26992d234b2d60ec7778829b238c742f9
-MD5 d39c09a9ddc8b8a0e62d4ff3e002f783 files/flex-2.5.31-gnu-m4.patch 1028
-RMD160 346124df8e0ce5d17c6743a24c69bd1d306ca2d2 files/flex-2.5.31-gnu-m4.patch 1028
-SHA256 d82107aed35cccb455c27335682facc26992d234b2d60ec7778829b238c742f9 files/flex-2.5.31-gnu-m4.patch 1028
 AUX flex-2.5.31-include.patch 387 RMD160 450ae53279820d2d8c702be0f471be07892f96f0 SHA1 3f62417bc5eb83f4f7829ff58c2d586467941cb0 SHA256 deb8f99edc8b3eca11515e36db959d27503c5c1fc317a4ead39f40cc0ec61bce
 MD5 2e16e2031744c71cd9cd1019ff0a1af3 files/flex-2.5.31-include.patch 387
 RMD160 450ae53279820d2d8c702be0f471be07892f96f0 files/flex-2.5.31-include.patch 387
 SHA256 deb8f99edc8b3eca11515e36db959d27503c5c1fc317a4ead39f40cc0ec61bce files/flex-2.5.31-include.patch 387
-AUX flex-2.5.31-isatty.patch 1221 RMD160 fe2b900bbcf826cef51f231ec61b690e26e210cc SHA1 f96462a2263ea984f9714b7c6c1bb6e7b49564cb SHA256 482acd3f9f3d2537c307ce6d7523e739f5b74830aab2d9c38bd7a4d85963bed9
-MD5 2ddb288cb26eb82cf3af19f2ec17ae0e files/flex-2.5.31-isatty.patch 1221
-RMD160 fe2b900bbcf826cef51f231ec61b690e26e210cc files/flex-2.5.31-isatty.patch 1221
-SHA256 482acd3f9f3d2537c307ce6d7523e739f5b74830aab2d9c38bd7a4d85963bed9 files/flex-2.5.31-isatty.patch 1221
 AUX flex-2.5.33-isatty.patch 1232 RMD160 5dd313a47f30002972788135e91a513bc286effd SHA1 e297269dca9763e213441bbc61cb762b30437cd1 SHA256 0ef8fb7b31e851c97282f8d3d02aeb7e90eb4ad7a33645d833d6d7fec2c12a75
 MD5 52deb7760ae4ce64c20029c5e4b2a5d0 files/flex-2.5.33-isatty.patch 1232
 RMD160 5dd313a47f30002972788135e91a513bc286effd files/flex-2.5.33-isatty.patch 1232
@@ -52,18 +40,14 @@ SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/fl
 DIST flex-2.5.33.tar.bz2 695464 RMD160 360e08457d324c5b87c02b0ed61983877c173c98 SHA1 acdb8fff6455967ad1a5bfc71855dbcc1253ee56 SHA256 53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914
 DIST flex-2.5.4a-autoconf.patch.bz2 13710 RMD160 e2797f6e1e0f60cb715906eae34415a66b0e3f8b SHA1 ff2a951abdb82a2384bf3c643ae7f4e8c913fdc2 SHA256 d2c9367c0995c8cc986c4e991e880bf49ce2766df3e5139b6811a67ee94ce46c
 DIST flex-2.5.4a.tar.gz 380995 RMD160 6b8ff62207fd3961ad2544db083cec1e42b8519b SHA1 38a5e15c348d2ca7dce94d71de2b51484d23e2ef SHA256 791e8e26d35faed05654b17fe3a9e64eea0874d623c5aaaaf532e164378e8407
-EBUILD flex-2.5.33-r1.ebuild 1130 RMD160 f6ced1e5bae13c558aeeb199297e9a6604876982 SHA1 1c00816b8ac74fc7e1d48237a9f95a2074d8d7a4 SHA256 5c7ebc1a15a8bc75b9e00db0e89d1b5b37366dac4bbd38d60063aaa295c24d47
-MD5 93d07a91fa652720deb3cad5b5bd40b0 flex-2.5.33-r1.ebuild 1130
-RMD160 f6ced1e5bae13c558aeeb199297e9a6604876982 flex-2.5.33-r1.ebuild 1130
-SHA256 5c7ebc1a15a8bc75b9e00db0e89d1b5b37366dac4bbd38d60063aaa295c24d47 flex-2.5.33-r1.ebuild 1130
 EBUILD flex-2.5.33-r2.ebuild 1168 RMD160 0cd33ea90c900a0b6b473f0ffb35f73e9689d24d SHA1 c2f0d00ae6e64cba3d6951f5e862f83cd9e70102 SHA256 cd2a66b1333ef43966502e1da6c195b5786250a038eab2c1fcc53fb7bc2836e9
 MD5 a06f6e373f1a9395ce03195b8d338689 flex-2.5.33-r2.ebuild 1168
 RMD160 0cd33ea90c900a0b6b473f0ffb35f73e9689d24d flex-2.5.33-r2.ebuild 1168
 SHA256 cd2a66b1333ef43966502e1da6c195b5786250a038eab2c1fcc53fb7bc2836e9 flex-2.5.33-r2.ebuild 1168
-EBUILD flex-2.5.33-r3.ebuild 1210 RMD160 47261a1e8f57737dc146739b3c1420d2dfc8ed71 SHA1 1e28cba52a05d4ef1b5add249372363905aba146 SHA256 71aaad7cfe58e48610b13e41eeabc470f88a9d18b255703f20986c620fd68812
-MD5 84589b30843706b545e07bb0db698d63 flex-2.5.33-r3.ebuild 1210
-RMD160 47261a1e8f57737dc146739b3c1420d2dfc8ed71 flex-2.5.33-r3.ebuild 1210
-SHA256 71aaad7cfe58e48610b13e41eeabc470f88a9d18b255703f20986c620fd68812 flex-2.5.33-r3.ebuild 1210
+EBUILD flex-2.5.33-r3.ebuild 1223 RMD160 0cc0c34ff24d50ba699679d1465bafa42ad94554 SHA1 cf8307691a79c50649ee3b6e0e010f93a53a48a6 SHA256 e8100b3c2081377bec07fc3c9f9fb7fd720e87cdedd68927aeca927dbe1b5334
+MD5 434d8c98bc9e540907bd9e6631dfe5f5 flex-2.5.33-r3.ebuild 1223
+RMD160 0cc0c34ff24d50ba699679d1465bafa42ad94554 flex-2.5.33-r3.ebuild 1223
+SHA256 e8100b3c2081377bec07fc3c9f9fb7fd720e87cdedd68927aeca927dbe1b5334 flex-2.5.33-r3.ebuild 1223
 EBUILD flex-2.5.4a-r6.ebuild 1503 RMD160 5d55d4d97f3db7b5723b668d52b8e408dea5c5a0 SHA1 a995e0af8b13cf73a303157998ed4ac8a62a966a SHA256 3a5bdc146e8965503d8adc65ed235a8d4a1384da17d2bad85ce0df3e3372bc55
 MD5 db3a332edb8736f7ab472366015aebf3 flex-2.5.4a-r6.ebuild 1503
 RMD160 5d55d4d97f3db7b5723b668d52b8e408dea5c5a0 flex-2.5.4a-r6.ebuild 1503
@@ -76,9 +60,6 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 e68b10187d8bdca8df57ac846f303f60 files/digest-flex-2.5.33-r1 238
-RMD160 94aecec05781807a73dfd57470b2945b702e821e files/digest-flex-2.5.33-r1 238
-SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/digest-flex-2.5.33-r1 238
 MD5 e68b10187d8bdca8df57ac846f303f60 files/digest-flex-2.5.33-r2 238
 RMD160 94aecec05781807a73dfd57470b2945b702e821e files/digest-flex-2.5.33-r2 238
 SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/digest-flex-2.5.33-r2 238
@@ -91,7 +72,7 @@ SHA256 0747f6d3edfddecae7e8463a4186e61ba1c025c09babaab95c074d13ba46b698 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGrbkap/wUKkr7RBoRAm7OAJ9XUNUkHfO0GaL1FDkiiypnCq5BJQCgn46O
-KmZJUxq6sTCC2FnhxlHXLp8=
-=2bku
+iD8DBQFGrbl9p/wUKkr7RBoRAuKRAKChAAOpgoUHspEB03VcN0L2zpol4wCfRAcw
+3q7BOwaXXXvf53az/pS6sDo=
+=CsNY
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/digest-flex-2.5.33-r1 b/sys-devel/flex/files/digest-flex-2.5.33-r1
deleted file mode 100644
index 7a65ac6d8d99..000000000000
--- a/sys-devel/flex/files/digest-flex-2.5.33-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 343374a00b38d9e39d1158b71af37150 flex-2.5.33.tar.bz2 695464
-RMD160 360e08457d324c5b87c02b0ed61983877c173c98 flex-2.5.33.tar.bz2 695464
-SHA256 53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914 flex-2.5.33.tar.bz2 695464
diff --git a/sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch b/sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch
deleted file mode 100644
index fe60828b41c1..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-the source code has an '#ifdef HAVE_LOCALE_H' but forgets to
-actually check for locale.h in configure
-
-http://bugs.gentoo.org/121920
-
---- flex-2.5.31/configure
-+++ flex-2.5.31/configure
-@@ -6964,7 +6991,7 @@
- 
- 
- 
--for ac_header in unistd.h stdbool.h  netinet/in.h limits.h
-+for ac_header in unistd.h stdbool.h  netinet/in.h limits.h locale.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
---- flex-2.5.31/conf.in
-+++ flex-2.5.31/conf.in
-@@ -4,6 +4,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
- /* Define to 1 if you have the <cunistd> header file. */
- #undef HAVE_CUNISTD
- 
-configure.in changes
- dnl checks for header files
- 
- AC_HEADER_STDC
--AC_CHECK_HEADERS(unistd.h stdbool.h  netinet/in.h limits.h)
-+AC_CHECK_HEADERS(unistd.h stdbool.h  netinet/in.h limits.h locale.h)
- AC_CHECK_HEADERS( sys/wait.h sys/params.h)
- AC_CHECK_HEADERS(cunistd)
- 
diff --git a/sys-devel/flex/files/flex-2.5.31-gnu-m4.patch b/sys-devel/flex/files/flex-2.5.31-gnu-m4.patch
deleted file mode 100644
index 875a0e663f52..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-gnu-m4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This is a simple hack to get flex to use GNU m4 on non-GNU systems.
-The issue has been fixed properly upstream already, we use this
-because it's much smaller.
-
-Patch by Diego Pettenò
-
-http://bugs.gentoo.org/123471
-
---- flex-2.5.31/main.c
-+++ flex-2.5.31/main.c
-@@ -344,7 +344,7 @@ void check_options ()
- 
-     /* Setup the filter chain. */
-     output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
--    filter_create_ext(output_chain,"m4","-P",0);
-+    filter_create_ext(output_chain,GM4_PROGRAM,"-P",0);
-     filter_create_int(output_chain, filter_fix_linedirs, NULL);
- 
-     /* For debugging, only run the requested number of filters. */
---- flex-2.5.31/Makefile.in
-+++ flex-2.5.31/Makefile.in
-@@ -290,7 +290,7 @@ SUBDIRS = \
- 
- 
- localedir = $(datadir)/locale
--AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -DGM4_PROGRAM=\"@M4@\"
- 
- # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
- #
diff --git a/sys-devel/flex/files/flex-2.5.31-isatty.patch b/sys-devel/flex/files/flex-2.5.31-isatty.patch
deleted file mode 100644
index ca272cfe2182..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-isatty.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Declare the isatty prototype all the time ... otherwise packages like
-doxygen and ttmkfdir fail to build.
-
-http://bugs.gentoo.org/119598
-
---- flex/scan.c
-+++ flex/scan.c
-@@ -3935,9 +3935,19 @@
- 	yyfree((void *) b  );
- }
- 
-+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
--#ifndef __cplusplus
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#ifdef __THROW /* this is a gnuism */
-+extern int isatty (int ) __THROW;
-+#else
- extern int isatty (int );
-+#endif
--#endif /* __cplusplus */
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-     
- /* Initializes or reinitializes a buffer.
-  * This function is sometimes called more than once on the same buffer,
---- flex/skel.c
-+++ flex/skel.c
-@@ -2183,9 +2183,19 @@
-   "[[",
-   "    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
-   "    [[",
-+  "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
--  "#ifndef __cplusplus",
-+  "#ifdef __cplusplus",
-+  "extern \"C\" {",
-+  "#endif",
-+  "#ifdef __THROW /* this is a gnuism */",
-+  "extern int isatty M4_YY_PARAMS( int ) __THROW;",
-+  "#else",
-   "extern int isatty M4_YY_PARAMS( int );",
-+  "#endif",
--  "#endif /* __cplusplus */",
-+  "#ifdef __cplusplus",
-+  "}",
-+  "#endif",
-+  "#endif",
-   "    ]])",
-   "]])",
-   "%endif",
diff --git a/sys-devel/flex/flex-2.5.33-r1.ebuild b/sys-devel/flex/flex-2.5.33-r1.ebuild
deleted file mode 100644
index 240b48176036..000000000000
--- a/sys-devel/flex/flex-2.5.33-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.33-r1.ebuild,v 1.9 2007/02/28 22:23:35 genstef Exp $
-
-inherit eutils flag-o-matic
-
-#DEB_VER=36
-DESCRIPTION="GNU lexical analyser generator"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.bz2"
-#	mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ -n ${DEB_VER} ]] && epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
-	epatch "${FILESDIR}"/${PN}-2.5.31-include.patch
-	epatch "${FILESDIR}"/${P}-isatty.patch #119598
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
-	dosym flex /usr/bin/lex
-}