diff options
Diffstat (limited to 'sys-devel/flex')
| -rw-r--r-- | sys-devel/flex/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-devel/flex/Manifest | 27 | ||||
| -rw-r--r-- | sys-devel/flex/files/digest-flex-2.5.31-r1 | 2 | ||||
| -rw-r--r-- | sys-devel/flex/files/flex-2.5.31-isatty.patch | 40 | ||||
| -rw-r--r-- | sys-devel/flex/flex-2.5.31-r1.ebuild | 45 |
5 files changed, 109 insertions, 13 deletions
diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog index ffaf1824b187..8f068969caa1 100644 --- a/sys-devel/flex/ChangeLog +++ b/sys-devel/flex/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/flex # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.35 2006/02/04 00:46:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.36 2006/02/06 23:17:45 vapier Exp $ + +*flex-2.5.31-r1 (06 Feb 2006) + + 06 Feb 2006; Mike Frysinger <vapier@gentoo.org> + +files/flex-2.5.31-isatty.patch, +flex-2.5.31-r1.ebuild: + Fix building C++ apps like doxygen #119598 by Michael Cramer. 04 Feb 2006; Mike Frysinger <vapier@gentoo.org> +files/flex-configure-LANG.patch, flex-2.5.4a-r6.ebuild: diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest index 914d3fca73d4..192b85e2b625 100644 --- a/sys-devel/flex/Manifest +++ b/sys-devel/flex/Manifest @@ -1,12 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 04c3f0655baa340c7804ca3c2569af07 ChangeLog 2805 -RMD160 1c67c95e57079b5d2ce763874df1e8776a4227a1 ChangeLog 2805 -SHA256 21ebfea36af940366d4c6d4e4c268e07ed79936b111d96f89161d28e9d810788 ChangeLog 2805 -MD5 8c9da1ab91353ab97d100e499ae722f7 files/digest-flex-2.5.31 131 -RMD160 5a8f2d987764982a9a75548f08ffcdc084e7f0f9 files/digest-flex-2.5.31 131 -SHA256 79b8290044e824b02fe32822d696b2f8e580d66147964cd6ac94de6af68857d6 files/digest-flex-2.5.31 131 +MD5 9bf1f71c3175889f90628fee06fc3c15 ChangeLog 3010 +RMD160 4bf1cf5d11cea56cc6ee93333ae2ff5e10b22fd6 ChangeLog 3010 +SHA256 5ba9fc85f7a5aa1fd38b14d46671aae4b60438696ce1e3f036625c59ffabefea ChangeLog 3010 +MD5 8c9da1ab91353ab97d100e499ae722f7 files/digest-flex-2.5.31-r1 131 +RMD160 5a8f2d987764982a9a75548f08ffcdc084e7f0f9 files/digest-flex-2.5.31-r1 131 +SHA256 79b8290044e824b02fe32822d696b2f8e580d66147964cd6ac94de6af68857d6 files/digest-flex-2.5.31-r1 131 MD5 a50411d58e9407414db98087253bdacd files/digest-flex-2.5.4a-r5 63 RMD160 c798ce732fdcd129c48305919d971735e7b5b4d5 files/digest-flex-2.5.4a-r5 63 SHA256 20dd99d2ba78a7231f939e845feee2fa7f6522158889f77eb5d17765bf53ba04 files/digest-flex-2.5.4a-r5 63 @@ -16,6 +16,9 @@ SHA256 3e20e677f6a05467dfdef44c23ed1047c0c4d1d0ff854724bac359f5491a413e files/di 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 +MD5 5669fcd03ee701361a6186d586e8e290 files/flex-2.5.31-isatty.patch 798 +RMD160 751ebebedef5760a08454879b9ef6f4d7f2de121 files/flex-2.5.31-isatty.patch 798 +SHA256 905bc8b9bf78cf1f60dd294fa67ab82270265b4cb074f72e8d2c856e42b36d72 files/flex-2.5.31-isatty.patch 798 MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241 RMD160 124f5d395b4be1926420ad9dace170ef1eba24da files/flex-2.5.4-glibc22.patch 2241 SHA256 787c733eb4e4d4272930a43fbf13b045c6ed2b363a3066e42eed38bc3c5b0941 files/flex-2.5.4-glibc22.patch 2241 @@ -31,9 +34,9 @@ SHA256 950bf0133a892332d73678b2ca35978abe6184ba9a29e38e60f6e7be773409a8 files/fl MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686 -MD5 8469b176ce2b8fb51558f801837fac0d flex-2.5.31.ebuild 1124 -RMD160 631effe176ed11d40193ba16d06091203a6cf72d flex-2.5.31.ebuild 1124 -SHA256 0a7de7aad30448e4db9961093ab825348769f1fa7b3381a0d4f155ed4263b96b flex-2.5.31.ebuild 1124 +MD5 371b258d6ecf7fd2753f9f10986a9fba flex-2.5.31-r1.ebuild 1167 +RMD160 5c852589885d990012fd71354cb46ee82836d602 flex-2.5.31-r1.ebuild 1167 +SHA256 fa496957b7cca06b80c3c611a0fe05f1aeb99aa2f256b2ac13da64921326faa3 flex-2.5.31-r1.ebuild 1167 MD5 3f4500ac9117f90f14a3a82e3a5dc488 flex-2.5.4a-r5.ebuild 1304 RMD160 5362fd95822598aa3ed519f8d21e185ea22bb04c flex-2.5.4a-r5.ebuild 1304 SHA256 de0ecc67f9ace3737258c8df6c658d270e885ad4d5627e363acf86aa60c7b72b flex-2.5.4a-r5.ebuild 1304 @@ -46,7 +49,7 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFD4/mR2+ySkm8kpY0RAgq1AJ9BEfy9omEXuqwC/mtiPgdNYFL+fACeJ0qw -xuXXIrU2OMFC4ltLBSwMFKE= -=bXBi +iD8DBQFD59kx2+ySkm8kpY0RAssOAJ90pAfdTUW/9/hUpXScS951cnhxQgCfVPel +WbOgU9rUZbZsL1vcnK+hKvM= +=O781 -----END PGP SIGNATURE----- diff --git a/sys-devel/flex/files/digest-flex-2.5.31-r1 b/sys-devel/flex/files/digest-flex-2.5.31-r1 new file mode 100644 index 000000000000..61100ba95b7b --- /dev/null +++ b/sys-devel/flex/files/digest-flex-2.5.31-r1 @@ -0,0 +1,2 @@ +MD5 363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 681792 +MD5 7ed573f6e5f9cf7ddea521bc06bedb8a flex_2.5.31-36.diff.gz 211072 diff --git a/sys-devel/flex/files/flex-2.5.31-isatty.patch b/sys-devel/flex/files/flex-2.5.31-isatty.patch new file mode 100644 index 000000000000..402d47b9a31e --- /dev/null +++ b/sys-devel/flex/files/flex-2.5.31-isatty.patch @@ -0,0 +1,40 @@ +Declare the isatty prototype all the time + +http://bugs.gentoo.org/119598 + +--- flex/scan.c ++++ flex/scan.c +@@ -3935,9 +3935,13 @@ + yyfree((void *) b ); + } + +-#ifndef __cplusplus ++#ifdef __cplusplus ++extern "C" { ++#endif + extern int isatty (int ); +-#endif /* __cplusplus */ ++#ifdef __cplusplus ++} ++#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,13 @@ + "[[", + " m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,", + " [[", +- "#ifndef __cplusplus", ++ "#ifdef __cplusplus", ++ "extern \"C\" {", ++ "#endif", + "extern int isatty M4_YY_PARAMS( int );", +- "#endif /* __cplusplus */", ++ "#ifdef __cplusplus", ++ "}", ++ "#endif", + " ]])", + "]])", + "%endif", diff --git a/sys-devel/flex/flex-2.5.31-r1.ebuild b/sys-devel/flex/flex-2.5.31-r1.ebuild new file mode 100644 index 000000000000..32ee71cb2bf7 --- /dev/null +++ b/sys-devel/flex/flex-2.5.31-r1.ebuild @@ -0,0 +1,45 @@ +# 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.31-r1.ebuild,v 1.10 2006/02/06 23:17:45 vapier Exp $ + +inherit eutils flag-o-matic + +DEB_VER=36 +DESCRIPTION="GNU lexical analyser generator" +HOMEPAGE="http://lex.sourceforge.net/" +SRC_URI="mirror://sourceforge/lex/${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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="build nls static" + +DEPEND="nls? ( sys-devel/gettext )" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff + epatch "${FILESDIR}"/${P}-include.patch + epatch "${FILESDIR}"/${P}-isatty.patch +} + +src_compile() { + use static && append-ldflags -static + econf $(use_enable nls) || die + emake || die +} + +src_install() { + make install DESTDIR="${D}" || die "make install failed" + + if use build ; then + rm -r "${D}"/usr/{include,lib,share} + else + dodoc AUTHORS ChangeLog NEWS ONEWS README* RoadMap THANKS TODO + fi + + dosym flex /usr/bin/lex +} |