| 1 |
jer 14/07/10 18:54:14 |
| 2 |
|
| 3 |
Modified: ChangeLog amap-5.4.ebuild |
| 4 |
Log: |
| 5 |
EAPI bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.55 net-analyzer/amap/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/ChangeLog?rev=1.55&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/ChangeLog?rev=1.55&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/ChangeLog?r1=1.54&r2=1.55 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v |
| 19 |
retrieving revision 1.54 |
| 20 |
retrieving revision 1.55 |
| 21 |
diff -u -r1.54 -r1.55 |
| 22 |
--- ChangeLog 20 Jan 2014 23:21:46 -0000 1.54 |
| 23 |
+++ ChangeLog 10 Jul 2014 18:54:14 -0000 1.55 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-analyzer/amap |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.54 2014/01/20 23:21:46 robbat2 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.55 2014/07/10 18:54:14 jer Exp $ |
| 29 |
+ |
| 30 |
+ 10 Jul 2014; Jeroen Roovers <jer@g.o> amap-5.4.ebuild: |
| 31 |
+ EAPI bump. |
| 32 |
|
| 33 |
20 Jan 2014; Robin H. Johnson <robbat2@g.o> amap-5.4.ebuild: |
| 34 |
Download only available via HTTPS. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.8 net-analyzer/amap/amap-5.4.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild?rev=1.8&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild?rev=1.8&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild?r1=1.7&r2=1.8 |
| 43 |
|
| 44 |
Index: amap-5.4.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v |
| 47 |
retrieving revision 1.7 |
| 48 |
retrieving revision 1.8 |
| 49 |
diff -u -r1.7 -r1.8 |
| 50 |
--- amap-5.4.ebuild 20 Jan 2014 23:21:46 -0000 1.7 |
| 51 |
+++ amap-5.4.ebuild 10 Jul 2014 18:54:14 -0000 1.8 |
| 52 |
@@ -1,8 +1,8 @@ |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v 1.7 2014/01/20 23:21:46 robbat2 Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v 1.8 2014/07/10 18:54:14 jer Exp $ |
| 57 |
|
| 58 |
-EAPI="2" |
| 59 |
+EAPI=5 |
| 60 |
|
| 61 |
inherit eutils toolchain-funcs |
| 62 |
|
| 63 |
@@ -25,48 +25,48 @@ |
| 64 |
" |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
- rm -rf pcre-3.9 |
| 68 |
- sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die "sed amap-lib.c failed" |
| 69 |
+ rm -r pcre-3.9 || die |
| 70 |
+ sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die |
| 71 |
# Above change requires below change. See sources... |
| 72 |
- sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die "sed amap-lib.c failed" |
| 73 |
- sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed" |
| 74 |
+ sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die |
| 75 |
+ sed -i 's:/usr/local:/usr:' amap.h || die |
| 76 |
# Files to be updated are at different location, bug 207839. |
| 77 |
- sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die "sed amap.h failed" |
| 78 |
+ sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die |
| 79 |
|
| 80 |
- sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die "sed Makefile.am failed" |
| 81 |
+ sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die |
| 82 |
|
| 83 |
epatch "${FILESDIR}"/4.8-system-pcre.patch |
| 84 |
} |
| 85 |
|
| 86 |
src_configure() { |
| 87 |
- # has it's own stupid custom configure script |
| 88 |
- ./configure || die "configure failed" |
| 89 |
+ # non-autotools configure script |
| 90 |
+ ./configure || die |
| 91 |
sed -i \ |
| 92 |
-e '/^XDEFINES=/s:=.*:=:' \ |
| 93 |
-e '/^XLIBS=/s:=.*:=:' \ |
| 94 |
-e '/^XLIBPATHS/s:=.*:=:' \ |
| 95 |
-e '/^XIPATHS=/s:=.*:=:' \ |
| 96 |
-e "/^CC=/d" \ |
| 97 |
- Makefile || die "pruning vars" |
| 98 |
+ Makefile || die |
| 99 |
if use ssl ; then |
| 100 |
sed -i \ |
| 101 |
-e '/^XDEFINES=/s:=:=-DOPENSSL:' \ |
| 102 |
-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ |
| 103 |
- Makefile || die "adding ssl" |
| 104 |
+ Makefile || die |
| 105 |
fi |
| 106 |
sed -i Makefile \ |
| 107 |
-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ |
| 108 |
- || die "respecting LDFLAGS failed" |
| 109 |
+ || die |
| 110 |
} |
| 111 |
|
| 112 |
src_compile() { |
| 113 |
- emake CC=$(tc-getCC) OPT="${CFLAGS}" || die "emake failed" |
| 114 |
+ emake CC=$(tc-getCC) OPT="${CFLAGS}" |
| 115 |
} |
| 116 |
|
| 117 |
src_install() { |
| 118 |
- dobin amap amapcrap || die "dobin failed" |
| 119 |
+ dobin amap amapcrap |
| 120 |
insinto /usr/share/amap |
| 121 |
- doins appdefs.* || die "doins failed" |
| 122 |
+ doins appdefs.* |
| 123 |
|
| 124 |
doman ${PN}.1 |
| 125 |
dodoc README TODO CHANGES |
Archives