Remove old ebuild. Do patching work in src_unpack, do not install COPYING/INSTALL, use newinitd and newconfd instead of newexe. Also add virtual/libintl to RDEPEND conditional to nls.

Package-Manager: portage-2.1_pre4-r1 vanquishing potions will fly

6 files changed, 39 insertions, 64 deletions

diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index d3b3a14c7f0a..740fa91b3ca4 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/darkstat
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.14 2006/02/15 21:56:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.15 2006/02/25 23:46:38 vanquirius Exp $
+
+  26 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -darkstat-2.6.ebuild,
+  darkstat-2.6-r1.ebuild:
+  Remove old ebuild. Do patching work in src_unpack, do not install
+  COPYING/INSTALL, use newinitd and newconfd instead of newexe. Also add
+  virtual/libintl to RDEPEND conditional to nls.
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> darkstat-2.6.ebuild,
   darkstat-2.6-r1.ebuild:
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 4bbf145c553c..b3303bf9c0f9 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1,21 +1,15 @@
-MD5 d23988d30db4a9e2344cca2251645306 ChangeLog 1910
-RMD160 e4ad913888413aa7a4a0de9d2a01f3b5f3a4ba60 ChangeLog 1910
-SHA256 b2cd99cfc0848e1e038673e7ffa5fbd10f193b864ae3d1c8ae5c24da23c4f70c ChangeLog 1910
-MD5 5cf3f469f8c873e73d42e03b5e8afcf8 darkstat-2.6-r1.ebuild 1078
-RMD160 ebb5066704d8e791559083f4b8b8072173e22eb7 darkstat-2.6-r1.ebuild 1078
-SHA256 5f06333a36295d878a4ca2b4013338a47d4f9c36def37aa1b290244771418886 darkstat-2.6-r1.ebuild 1078
-MD5 1f1709a80d30952358039ada1cdbf3e1 darkstat-2.6.ebuild 1006
-RMD160 588c7815daae557505c8870a74dcf09e46c452cb darkstat-2.6.ebuild 1006
-SHA256 bb0cb27dfaf12e9a6d2ff2732eda9e1569bd7fbebb4dcef1f4b9823e1dbc7110 darkstat-2.6.ebuild 1006
+MD5 ef6c71714074342c277d8e9c753975a1 ChangeLog 2206
+RMD160 0309234861f11b2b504be3d49759ca4321a011ce ChangeLog 2206
+SHA256 11e15b2d616679ad4b5b55cb97f093f7dd8e094deb112321036d47b1d282f404 ChangeLog 2206
+MD5 3234312b2f7eeecbd9c70e5b1f0b6262 darkstat-2.6-r1.ebuild 1098
+RMD160 122104385abbe612051f1ac2be596b2b7749b965 darkstat-2.6-r1.ebuild 1098
+SHA256 9f25335455e575c935a1a39d9b5d99878aff5a4e22e8ea190fb915bc3f536436 darkstat-2.6-r1.ebuild 1098
 MD5 44483f0b13561a54b68949145198339f files/darkstat-confd 214
 RMD160 7543c6565c89f17972efbcef311463192666ad2f files/darkstat-confd 214
 SHA256 b01ec832d444fcebce95f907661527064846563c3fd268a1366652b6e3c2ecf1 files/darkstat-confd 214
 MD5 4f9e9fe82455fe072de4dda411802936 files/darkstat-init 568
 RMD160 0a5359094e5ab52a10339bed98e21d2030299f79 files/darkstat-init 568
 SHA256 d363726dfe220904fb5fdca1b99e4546b2ef9be1691f4f125a8254b99c502e8b files/darkstat-init 568
-MD5 65647b954a76c7c35eef2f47dfdb5355 files/digest-darkstat-2.6 64
-RMD160 98734ff617ee0774a5c635cb98e5386af459de1c files/digest-darkstat-2.6 64
-SHA256 2d096fb76a51d0944540155fd51ffc8d8cd68cc194fda319022a8220bef5a90c files/digest-darkstat-2.6 64
 MD5 65647b954a76c7c35eef2f47dfdb5355 files/digest-darkstat-2.6-r1 64
 RMD160 98734ff617ee0774a5c635cb98e5386af459de1c files/digest-darkstat-2.6-r1 64
 SHA256 2d096fb76a51d0944540155fd51ffc8d8cd68cc194fda319022a8220bef5a90c files/digest-darkstat-2.6-r1 64
diff --git a/net-analyzer/darkstat/darkstat-2.6-r1.ebuild b/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
index 6a82fd4b0990..1d64e3266ec5 100644
--- a/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6-r1.ebuild,v 1.8 2006/02/15 21:56:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6-r1.ebuild,v 1.9 2006/02/25 23:46:38 vanquirius Exp $
 
 inherit eutils
 
@@ -14,12 +14,16 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="net-libs/libpcap
-		nls? ( sys-devel/gettext ) "
-RDEPEND=""
+	nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( virtual/libintl )"
 
-src_compile() {
-	epatch ${FILESDIR}/ipcheck.patch
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ipcheck.patch
+}
 
+src_compile() {
 	use nls && myconf="`use_with nls`"
 	./configure \
 		--host=${CHOST} \
@@ -31,13 +35,13 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodir /var/spool/darkstat
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL ISSUES NEWS README TODO
+	dodoc ABOUT-NLS AUTHORS ChangeLog ISSUES NEWS README TODO
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/darkstat-init darkstat
-	insinto /etc/conf.d ; newins ${FILESDIR}/darkstat-confd darkstat
+	newinitd "${FILESDIR}"/darkstat-init darkstat
+	newconfd "${FILESDIR}"/darkstat-confd darkstat
 }
 
diff --git a/net-analyzer/darkstat/darkstat-2.6.ebuild b/net-analyzer/darkstat/darkstat-2.6.ebuild
deleted file mode 100644
index d55dcf805abd..000000000000
--- a/net-analyzer/darkstat/darkstat-2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6.ebuild,v 1.6 2006/02/15 21:56:46 jokey Exp $
-
-DESCRIPTION="darkstat is a network traffic analyzer"
-HOMEPAGE="http://dmr.ath.cx/net/darkstat/"
-SRC_URI="http://dmr.ath.cx/net/darkstat/${P}.tar.gz"
-
-KEYWORDS="x86 ~ppc"
-IUSE="nls"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="net-libs/libpcap
-		nls? ( sys-devel/gettext ) "
-RDEPEND=""
-
-src_compile() {
-	use nls && myconf="`use_with nls`"
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-	emake || die
-}
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodir /var/spool/darkstat
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL ISSUES NEWS README TODO
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/darkstat-init darkstat
-	insinto /etc/conf.d ; newins ${FILESDIR}/darkstat-confd darkstat
-}
-
diff --git a/net-analyzer/darkstat/files/digest-darkstat-2.6 b/net-analyzer/darkstat/files/digest-darkstat-2.6
deleted file mode 100644
index 8793cd5ed65e..000000000000
--- a/net-analyzer/darkstat/files/digest-darkstat-2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a1a407acb6f9b35a46d64885c30d08d darkstat-2.6.tar.gz 230950
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index 625b101a28fd..83924019cb84 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -1,5 +1,15 @@
-MD5 988ae4284dfc87329acc495af85663ce echoping-5.2.0.ebuild 1319
-MD5 3d1b485ea7f3743394e8448e86464f3d ChangeLog 807
-MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
+MD5 d175fa1daca84383697761301b90d4dd ChangeLog 987
+RMD160 27ad8bbdd82bbf4ea85759b09d0e8077c2c22afa ChangeLog 987
+SHA256 f901efa1964da16fbdf35727b7b0a775ff8c4b8dbd454effb9572842eb3a67cc ChangeLog 987
+MD5 2a71a0a392b1efc6a2fb88d3268acfb3 echoping-5.2.0.ebuild 1315
+RMD160 b4c967d5308f95e11c363f6172dbfd1aee43d4ce echoping-5.2.0.ebuild 1315
+SHA256 124c70eac07892b2082dfa6e4936b9f7a3ece5290443594acc63d4a404f357c8 echoping-5.2.0.ebuild 1315
 MD5 4783578f5986c067408a04d82e5ed589 files/digest-echoping-5.2.0 66
+RMD160 0eb14ce40d06019bc08be0221dec77af22621b4e files/digest-echoping-5.2.0 66
+SHA256 672655ec45da6dda71698728bec4544309d4d406318a2a30efba2b6e35050784 files/digest-echoping-5.2.0 66
 MD5 031f7ebff5b4da097049a014ad9b4890 files/maxtoread-5.2.0.patch 298
+RMD160 093c8206d0cfb9c094cd486dac78a23ba88cac05 files/maxtoread-5.2.0.patch 298
+SHA256 1c521aad69008bb7b700b6535d755490678966d282d2de684dcd2225a2d278d0 files/maxtoread-5.2.0.patch 298
+MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
+RMD160 c90affd21977cad76b527a5ed07217b98666c9a1 metadata.xml 256
+SHA256 8a7f298ddfe860dbcc4ace70a9e700c55e69fb2869130831542156085c0b7b21 metadata.xml 256