jer 14/07/10 18:54:14 Modified: ChangeLog amap-5.4.ebuild Log: EAPI bump. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.55 net-analyzer/amap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/ChangeLog?rev=1.55&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/ChangeLog?rev=1.55&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/ChangeLog?r1=1.54&r2=1.55 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 20 Jan 2014 23:21:46 -0000 1.54 +++ ChangeLog 10 Jul 2014 18:54:14 -0000 1.55 @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/amap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.54 2014/01/20 23:21:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.55 2014/07/10 18:54:14 jer Exp $ + + 10 Jul 2014; Jeroen Roovers <[email protected]> amap-5.4.ebuild: + EAPI bump. 20 Jan 2014; Robin H. Johnson <[email protected]> amap-5.4.ebuild: Download only available via HTTPS. 1.8 net-analyzer/amap/amap-5.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild?r1=1.7&r2=1.8 Index: amap-5.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- amap-5.4.ebuild 20 Jan 2014 23:21:46 -0000 1.7 +++ amap-5.4.ebuild 10 Jul 2014 18:54:14 -0000 1.8 @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v 1.7 2014/01/20 23:21:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v 1.8 2014/07/10 18:54:14 jer Exp $ -EAPI="2" +EAPI=5 inherit eutils toolchain-funcs @@ -25,48 +25,48 @@ " src_prepare() { - rm -rf pcre-3.9 - sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die "sed amap-lib.c failed" + rm -r pcre-3.9 || die + sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die # Above change requires below change. See sources... - sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die "sed amap-lib.c failed" - sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed" + sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die + sed -i 's:/usr/local:/usr:' amap.h || die # Files to be updated are at different location, bug 207839. - sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die "sed amap.h failed" + sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die - sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die "sed Makefile.am failed" + sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die epatch "${FILESDIR}"/4.8-system-pcre.patch } src_configure() { - # has it's own stupid custom configure script - ./configure || die "configure failed" + # non-autotools configure script + ./configure || die sed -i \ -e '/^XDEFINES=/s:=.*:=:' \ -e '/^XLIBS=/s:=.*:=:' \ -e '/^XLIBPATHS/s:=.*:=:' \ -e '/^XIPATHS=/s:=.*:=:' \ -e "/^CC=/d" \ - Makefile || die "pruning vars" + Makefile || die if use ssl ; then sed -i \ -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ - Makefile || die "adding ssl" + Makefile || die fi sed -i Makefile \ -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ - || die "respecting LDFLAGS failed" + || die } src_compile() { - emake CC=$(tc-getCC) OPT="${CFLAGS}" || die "emake failed" + emake CC=$(tc-getCC) OPT="${CFLAGS}" } src_install() { - dobin amap amapcrap || die "dobin failed" + dobin amap amapcrap insinto /usr/share/amap - doins appdefs.* || die "doins failed" + doins appdefs.* doman ${PN}.1 dodoc README TODO CHANGES
