Added patch to fix mkinstalldirs path for bug 83310.

(Portage version: 2.0.51.19)

4 files changed, 29 insertions, 23 deletions

diff --git a/net-analyzer/etherape/ChangeLog b/net-analyzer/etherape/ChangeLog
index baacf7d5fc13..5ce1e236f852 100644
--- a/net-analyzer/etherape/ChangeLog
+++ b/net-analyzer/etherape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/etherape
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.18 2005/02/25 15:50:32 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.19 2005/03/10 10:32:34 ka0ttic Exp $
+
+  10 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/etherape-0.9.1-fix-mkinstalldirs.diff, etherape-0.9.1.ebuild:
+  Added patch to fix mkinstalldirs path for bug 83310.
 
   25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> etherape-0.9.1.ebuild:
   Revert keywords pending actual solution to 79385.
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 6bbce98b45ae..1e4a510c7f3f 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bd07910f7f59f293277e39d714be8edb etherape-0.9.1.ebuild 1212
+MD5 12c95233f6ad151674fc794b74118fde etherape-0.9.1.ebuild 1319
 MD5 86ed7cbef93ac3ea73732261ecd79ca9 etherape-0.8.2-r1.ebuild 1168
 MD5 8f52841a5c961e7167b5f3428490b69f etherape-0.9.0.ebuild 1258
-MD5 097db55e662f4286b894050d2fb7df96 ChangeLog 2636
+MD5 f6900c7e62f775bca2b7da46860d6784 ChangeLog 2812
 MD5 d8307d213e01909e87c072d2b3e9450c metadata.xml 254
 MD5 0015559610bab6a40691241598863f72 files/etherape-0.9.0-libpcap-include.patch 399
 MD5 878e13dfd52ac79ec511a2ff1d259b73 files/etherape-0.9.1-res_mkquery.patch 466
 MD5 efc64f22a1d8e39060fd684f5b105078 files/etherape-0.8.2-gcc3-gentoo.patch 518
+MD5 e0c5c68b74ad90834cbdea3b792a19a4 files/etherape-0.9.1-fix-mkinstalldirs.diff 563
 MD5 878e13dfd52ac79ec511a2ff1d259b73 files/etherape-0.9.0-res_mkquery.patch 466
 MD5 4ec4396b2bd551ad7dc1ddc3ca92a8e1 files/digest-etherape-0.9.0 66
 MD5 4fd767ede3dba0573f180002530b3018 files/digest-etherape-0.9.1 66
 MD5 fa35a411bca4af227afb869da4781b0c files/digest-etherape-0.8.2-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCH0lREZCkKN40op4RAiRHAJ9NFxX1GuK4UzdgVtPd7FeffQ0RYQCgmdgy
-0uZGfFuMei7jNXsSp4wg1OY=
-=MfiA
------END PGP SIGNATURE-----
diff --git a/net-analyzer/etherape/etherape-0.9.1.ebuild b/net-analyzer/etherape/etherape-0.9.1.ebuild
index 9238f843ca75..76b1b7d07d02 100644
--- a/net-analyzer/etherape/etherape-0.9.1.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.1.ebuild,v 1.5 2005/02/25 15:50:32 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.1.ebuild,v 1.6 2005/03/10 10:32:34 ka0ttic Exp $
 
 inherit eutils
 
-IUSE=""
 DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
 SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 HOMEPAGE="http://etherape.sourceforge.net/"
@@ -12,30 +11,30 @@ HOMEPAGE="http://etherape.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
 
 DEPEND=">=gnome-base/libglade-2.0
 	>=gnome-base/libgnomeui-2.0
 	virtual/libpcap
-	sys-devel/gettext
-	sys-devel/autoconf"
+	sys-devel/gettext"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	epatch ${FILESDIR}/${P}-res_mkquery.patch
+	epatch ${FILESDIR}/${P}-fix-mkinstalldirs.diff
 }
 
 src_compile() {
-	aclocal
-	autoconf
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
 
-	econf || die
-	emake || die
+	econf || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "failed to install"
+	make DESTDIR=${D} install || die "make install failed"
 
 	# move shortcut to gnome2 compliant location
 	dodir /usr/share/applications
diff --git a/net-analyzer/etherape/files/etherape-0.9.1-fix-mkinstalldirs.diff b/net-analyzer/etherape/files/etherape-0.9.1-fix-mkinstalldirs.diff
new file mode 100644
index 000000000000..decdf4f33eaf
--- /dev/null
+++ b/net-analyzer/etherape/files/etherape-0.9.1-fix-mkinstalldirs.diff
@@ -0,0 +1,12 @@
+diff --exclude='*~' -urN etherape-0.9.1.orig/po/Makefile.in.in etherape-0.9.1/po/Makefile.in.in
+--- etherape-0.9.1.orig/po/Makefile.in.in	2005-03-09 21:34:44.400414592 -0500
++++ etherape-0.9.1/po/Makefile.in.in	2005-03-09 21:36:47.325727104 -0500
+@@ -27,7 +27,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@