Added dev-libs/libpcre dep for bug 79403.

Package-Manager: portage-2.0.51-r15

4 files changed, 27 insertions, 21 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 37e7006ef744..b4b6a36e1915 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/amap
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.15 2005/01/09 05:16:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.16 2005/01/25 10:30:14 ka0ttic Exp $
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> amap-4.6.ebuild,
+  amap-4.7.ebuild:
+  Added dev-libs/libpcre dep for bug 79403.
 
 *amap-4.7 (09 Jan 2005)
 
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 03905656fa07..57cb4f0ce10d 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5ebc9f3a86ff38b18b05d2d8ee9fea3d amap-4.7.ebuild 1358
-MD5 adb203ccaff76e121de0b8426a3db48b amap-4.6.ebuild 1330
-MD5 76b8d7f65fd9a06a7cde4845737a9052 ChangeLog 1950
+MD5 6f1e34801a7ab85b6284cfeb3f889c29 amap-4.6.ebuild 1393
+MD5 7ee6c8fef4e565debeea30278013d81d amap-4.7.ebuild 1399
+MD5 782d2a898eb5ae48587af88ce640df45 ChangeLog 2076
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
 MD5 a5f16a887d88f7d685dbaed470ee6ec8 files/digest-amap-4.6 60
+MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
 MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
 MD5 c50165b5bb6fb19a617df68f6001d98d files/4.6-system-pcre.patch 1103
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB4L5ImdTrptrqvGERAur8AJ9YcxrVsSbiaK4kt9cPMS0MepQZrACdF0Tt
-RLIdOjScw2CxoX8RY2mQ0sY=
-=0Qg2
+iD8DBQFB9h/HEZCkKN40op4RAkVaAKCX8yw4SSIjDs8lFiAcEqULsddTWACeKYKF
+iy7iZfeEsVf3dV5yxlP3H0g=
+=QfBX
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/amap/amap-4.6.ebuild b/net-analyzer/amap/amap-4.6.ebuild
index bb1386b3d1b7..d6f034c5e3de 100644
--- a/net-analyzer/amap/amap-4.6.ebuild
+++ b/net-analyzer/amap/amap-4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.6.ebuild,v 1.2 2005/01/09 05:16:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.6.ebuild,v 1.3 2005/01/25 10:30:14 ka0ttic Exp $
 
 inherit eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
 DEPEND="virtual/libc
+	dev-libs/libpcre
 	ssl? ( >=dev-libs/openssl-0.9.6j )"
 
 src_unpack() {
@@ -22,7 +23,7 @@ src_unpack() {
 	sed -i \
 		-e 's:/usr/local:/usr:' \
 		-e '/AMAP_APPDEF_PATH/s:/bin:/share/amap:' \
-		amap.h || die
+		amap.h || die "sed amap.h failed"
 
 	rm -rf pcre-3.9
 	epatch ${FILESDIR}/${PV}-system-pcre.patch
@@ -30,7 +31,7 @@ src_unpack() {
 
 src_compile() {
 	# has it's own stupid custom configure script
-	./configure || die "configure"
+	./configure || die "configure failed"
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
@@ -43,13 +44,13 @@ src_compile() {
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
 			Makefile || die "adding ssl"
 	fi
-	emake OPT="${CFLAGS}" || die "make"
+	emake OPT="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin amap amapcrap || die "dobin"
+	dobin amap amapcrap || die "dobin failed"
 	insinto /usr/share/amap
-	doins appdefs.* || die "doins"
+	doins appdefs.* || die "doins failed"
 
 	doman ${PN}.1
 	dodoc README TODO CHANGES
diff --git a/net-analyzer/amap/amap-4.7.ebuild b/net-analyzer/amap/amap-4.7.ebuild
index 692e7a2aa940..312203f78411 100644
--- a/net-analyzer/amap/amap-4.7.ebuild
+++ b/net-analyzer/amap/amap-4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.7.ebuild,v 1.1 2005/01/09 05:16:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.7.ebuild,v 1.2 2005/01/25 10:30:14 ka0ttic Exp $
 
 inherit eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl"
 
 DEPEND="virtual/libc
+	dev-libs/libpcre
 	ssl? ( >=dev-libs/openssl-0.9.6j )"
 
 src_unpack() {
@@ -22,15 +23,15 @@ src_unpack() {
 	sed -i \
 		-e 's:/usr/local:/usr:' \
 		-e '/AMAP_APPDEF_PATH/s:/bin:/share/amap:' \
-		amap.h || die
+		amap.h || die "sed amap.h failed"
 
 	rm -rf pcre-3.9
-	epatch ${FILESDIR}/${PV}-system-pcre.patch || die "patch failed"
+	epatch ${FILESDIR}/${PV}-system-pcre.patch
 }
 
 src_compile() {
 	# has it's own stupid custom configure script
-	./configure || die "configure"
+	./configure || die "configure failed"
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
@@ -43,13 +44,13 @@ src_compile() {
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
 			Makefile || die "adding ssl"
 	fi
-	emake OPT="${CFLAGS}" || die "make"
+	emake OPT="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin amap amapcrap || die "dobin"
+	dobin amap amapcrap || die "dobin failed"
 	insinto /usr/share/amap
-	doins appdefs.* || die "doins"
+	doins appdefs.* || die "doins failed"
 
 	doman ${PN}.1
 	dodoc README TODO CHANGES