[patch] Comparison patch for the ebuild

flex-ebuild.patch (text/plain), 1.62 KB, created by Diego Elio Pettenò (RETIRED) on 2010-11-16 18:25:55 UTC

--- /home/flame/devel/repos/gentoo/tree/sys-devel/flex/flex-2.5.35.ebuild	2010-06-16 13:49:00.048913850 +0200
+++ flex-2.5.35_p10.ebuild	2010-11-16 18:49:14.689954001 +0100
@@ -2,13 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.35.ebuild,v 1.12 2010/06/08 19:00:00 ssuominen Exp $
 
-inherit eutils flag-o-matic
+EAPI=2
+
+inherit eutils flag-o-matic autotools
+
+if [[ ${PV} == *_p* ]]; then
+	DEB_DIFF=${PN}_${PV/_p/-}
+fi
+
+MY_P=${P%_p*}
 
-#DEB_VER=36
 DESCRIPTION="The Fast Lexical Analyzer"
 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"
+SRC_URI="mirror://sourceforge/flex/${MY_P}.tar.bz2
+	${DEB_DIFF+mirror://debian/pool/main/f/flex/${DEB_DIFF}.diff.gz}"
 
 LICENSE="FLEX"
 SLOT="0"
@@ -18,20 +25,19 @@
 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.34-isatty.patch #119598
-	epatch "${FILESDIR}"/${PN}-2.5.33-pic.patch
-	epatch "${FILESDIR}"/${PN}-2.5.35-gcc44.patch
-	sed -i 's:^LDFLAGS:LOADLIBES:' tests/test-pthread/Makefile.in #262989
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch ${DEB_DIFF+"${WORKDIR}"/${DEB_DIFF}.diff} \
+		"${FILESDIR}"/${PN}-2.5.35-gcc44.patch \
+		"${FILESDIR}"/${PN}-2.5.35-saneautotools.patch
+
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	use static && append-ldflags -static
 	econf $(use_enable nls) || die
-	emake || die
 }
 
 src_install() {