EAPI bump. Set SF project homepage as HOMEPAGE (bug #532462). Fix $PV.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA792A613

3 files changed, 33 insertions, 44 deletions

diff --git a/net-analyzer/aimsniff/ChangeLog b/net-analyzer/aimsniff/ChangeLog
index cfb286138d05..a6e47f1336c8 100644
--- a/net-analyzer/aimsniff/ChangeLog
+++ b/net-analyzer/aimsniff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/aimsniff
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.35 2012/09/18 01:34:06 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.36 2014/12/13 20:58:24 jer Exp $
+
+*aimsniff-0.9d (13 Dec 2014)
+
+  13 Dec 2014; Jeroen Roovers <jer@gentoo.org> -aimsniff-0.9-r2.ebuild,
+  +aimsniff-0.9d.ebuild:
+  EAPI bump. Set SF project homepage as HOMEPAGE (bug #532462). Fix $PV.
 
   18 Sep 2012; Tim Harder <radhermit@gentoo.org> -aimsniff-0.9-r1.ebuild:
   Remove old.
diff --git a/net-analyzer/aimsniff/Manifest b/net-analyzer/aimsniff/Manifest
index c431614c494a..8ae0f64e4fb4 100644
--- a/net-analyzer/aimsniff/Manifest
+++ b/net-analyzer/aimsniff/Manifest
@@ -2,19 +2,15 @@
 Hash: SHA256
 
 AUX aimsniff.rc 314 SHA256 a1086d1e80cdf1b0c16b56d4b64a876c1046ab79ab9ca7038019ff386746b2cd SHA512 c586488a30b31a773b0efce6f80ab3b45801f2eeb79f4cf4e189bf230d9953708fd5b4fb93416cb130d7ca911c0871e53946449d788b156a8ba23d7d211f0974 WHIRLPOOL 50f89f2ba7e8b11d320d12e5e37b2e1c32f2567d71263fdc077061c65370fe24da0c2ec89d61ec086b652a040087b72116b10916574d51ebc6589d173a8eb5c7
-DIST aimsniff-0.9d.tar.gz 24044 SHA256 11ce4cd3e1dcdabee0319dbb8a52c176debfbcd59c0c0c913078bb4b85619ac1
-DIST was-0.1.2b.tar.gz 73651 SHA256 0d1af84e7ed529cf0f8a63f4c72e8656ceccf0316cc42dcc9d856cbf8091635b
-EBUILD aimsniff-0.9-r2.ebuild 3156 SHA256 e61dae35119c16240dfe9623445a7813580365525531faf56a4949ec3c4e00d1 SHA512 af6735c21251462ff84988069fb7fc6761ee182f8e1292d90e4ee6946b0f5b2f81390b48c90abc54a688fc53626a15e4b9efc87e1d5f6db08fe3c21b92dbc0ee WHIRLPOOL f225312426c01f4e68bfe7f3c8818f5ebe4dfee5dfd6263fa726b5ba86b7b577bcf72b23ab54b1fb9ac1727d3f6bb89e5f287fef271144c11f7fd7c9320ffbae
-MISC ChangeLog 4710 SHA256 eed08d28fcec2733b566a5f9216de1c08279499802bcd7e8c7609d74dd4e67fc SHA512 143a0a2858c26b0559cccc8d5963846e0cc9f845d09a70fcfb096590210b610b07453d27ccbec305087199167e29fe6ca0ccdfe843a944ef2ef3662a57d298f0 WHIRLPOOL 0a63d2e93de0b4887d66f4278f7409a97aa093e04c63f7dbb7e3146aba7812b888314dcb4a13a7fc59be7d0d9c109ec4fcbd537cb5b69907b307f33ca10ace54
+DIST aimsniff-0.9d.tar.gz 24044 SHA256 11ce4cd3e1dcdabee0319dbb8a52c176debfbcd59c0c0c913078bb4b85619ac1 SHA512 eba8d1ff21c6c841f5e1b344769c38bf00936613c975dd60e0c3922e67805733c2e949006be36a83d75fc6c9c77de510a6914d184c6159e46b9d35cc4f12efa6 WHIRLPOOL 40a882204e0da03843a6a461b036dfb6a84f29fbee22f83c4d962ba0ca838b71499b51f8736ff99eadad7a0ecd30405c7df743081d258b0f4a7141bb20ef69cd
+DIST was-0.1.2b.tar.gz 73651 SHA256 0d1af84e7ed529cf0f8a63f4c72e8656ceccf0316cc42dcc9d856cbf8091635b SHA512 afbe8554c16df8305e781cf2dde3af1e7b25345dc1f5defc7723654479cc91d8f6fe9ddc3850fd487f77b241d40274edb2b7328ab011df93996264f14b98e6cd WHIRLPOOL cabbdbb0131ff633472b18226ed424c5d905f0dfbb92a36ccdd08cdba024ba94b88e4b497e10d9d6c4ebd000efa832a0a66ecd105e50a894ed48591633d80d16
+EBUILD aimsniff-0.9d.ebuild 2952 SHA256 cd7b63abce1a42c8de9e8418e4e9cb9c9e50cf07c6a616b97dd3af67a5400fc8 SHA512 fb0f3a3aee5eb29b5f65aa31f9840597b1ec12a63c828246305cbcf3c787bab1261401cd12ed916a8f3e787a8abafcc9d921325a4b2f6f3f65f49d1e259dae93 WHIRLPOOL 7d782a41ce462987175e43c76c33dfdc51ced6be80161d1229a098759fa98911f3b0a0c24f117ffcc1e7ebc9ee02629e591cef0fc921512a2e8be90b2816db48
+MISC ChangeLog 4905 SHA256 5f83eb60c464d85b2cfd4f404a13cb8f59e121d9cd81d449409d47890304cc28 SHA512 f0ef88d67ccc09d144c85fa1ab41a11d0993f4b9f1f6153b8e0142f6f14300dc06dada78ec412eddad6e75e8d670238f14e3bc6b4d46ce26696caad99a286b0a WHIRLPOOL 405dbe34480cce6280e37cf0bc8ef2a7b4983e424772319a8300808d35943694515eceb6e20955b8fbbda3a001bb2e78be55f91dced182e317564c06423ff9e7
 MISC metadata.xml 358 SHA256 34284a7cd3381665258eae277a64f92d3e7983d32b8e836e9631f1b521c37f04 SHA512 b4cf98eb8ff9abe4595f4d553c6bb7d620285cf7f0d552f5bdcbfbb00d222363bad4fcc36046dba32bd8e4b112e7e3974ddf0982de4196aae0ac85e0e241e657 WHIRLPOOL ed7b4dbcf5b62e38c361feeee01667ee3c698be8c88e768520c788a42d19309f50e724c9801e4e65647e1c9a9ad87c501236286af42c0e1f03b1048aad0d6bfd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQV8+UAAoJEEqz6FtPBkyjSogH/jWcEepAA02awhBJfzudxIVu
-aX4h7fftiVUGYaW8/qPmerZY+QPIoWhgDjYBHxEIHtra+Q/Sl8f0cl9hKtUayKEq
-MV4WPzw/u5sZLWRhenLTrAQ9NBj2HK8LSDoW5tdYCd1Yo3l1KMB1AEXUevAcH2Io
-7J8BdAQblwHwaZO25KKUPL7jiY8j3tSnqs39M5pgnNfK32GHLqmqv5CLVlSmZU83
-Vn5djsDPp/4MUgYFDY7b0sPvaQv2cFc1tU0yG+GdEkibwM3C2rKQLUR0uAyAtiBp
-iNUepbGy2QEx2CfuzRDyTnqsCMuO4ykxH/7hBRckk5otIqc/G5Ol7qVleeXxs9I=
-=Y70i
+iEYEAREIAAYFAlSMqHEACgkQVWmRsqeSphMvSgCeIrwvsKq+wq3yJNYyyj8Xxd++
+UFYAni55kxixgB7J9gBjsDuzY9FrKVuV
+=bTNK
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild b/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
index 22bc4ffa1a20..200450a28428 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r2.ebuild,v 1.14 2012/09/18 01:33:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9d.ebuild,v 1.1 2014/12/13 20:58:24 jer Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils webapp eutils depend.apache
 
-MY_P="${P}d"
 WAS_VER="0.1.2b"
 
 DESCRIPTION="Utility for monitoring and archiving AOL Instant Messenger messages across a network"
-HOMEPAGE="http://www.aimsniff.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
+HOMEPAGE="http://sourceforge.net/projects/aimsniff/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )
+"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc x86"
 #SLOT empty due to webapp
 IUSE="samba mysql http"
 
-DEPEND="dev-lang/perl[gdbm]
+RDEPEND="
+	dev-lang/perl[gdbm]
 	dev-perl/Net-Pcap
 	dev-perl/NetPacket
 	dev-perl/Unicode-String
@@ -28,29 +30,21 @@ DEPEND="dev-lang/perl[gdbm]
 	dev-perl/DBI
 	dev-perl/Unix-Syslog
 	mysql? ( virtual/mysql dev-perl/DBD-mysql )
-	samba? ( net-fs/samba )"
-RDEPEND=${DEPEND}
+	samba? ( net-fs/samba )
+"
 
 want_apache2 http
 
 RESTRICT="mirror"
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
 	depend.apache_pkg_setup http
 
-	if use http
-	then
-		webapp_pkg_setup
-	fi
+	use http && webapp_pkg_setup
 }
 
 src_install() {
-	if use http
-	then
-		webapp_src_preinst
-	fi
+	use http && webapp_src_preinst
 
 	newsbin aimSniff.pl aimsniff
 	insinto /etc/${PN}
@@ -59,8 +53,7 @@ src_install() {
 	doins table.struct
 	dodoc README ChangeLog
 
-	if use http
-	then
+	if use http; then
 		cp ../was-${WAS_VER}/docs/README README.WAS
 		dodoc README.WAS
 
@@ -73,10 +66,6 @@ src_install() {
 		# webapp_configfile'ed.
 		webapp_serverowned ${MY_HTDOCSDIR}/was/.config.php
 
-		for phpfile in `ls -a "${D}"${MY_HTDOCSDIR}/was/ | grep ".php$"`; do
-			webapp_runbycgibin php ${MY_HTDOCSDIR}/was/${phpfile}
-		done
-
 		webapp_src_install
 	fi
 
@@ -90,16 +79,14 @@ pkg_postinst() {
 		elog "To create and enable the mysql database, please run: "
 		elog "emerge --config =${PF}"
 
-		if use http
-		then
+		if use http; then
 			echo "To create and enable the mysql database, please run:
 			emerge --config =${PF}" > apache-postinst
 			webapp_postinst_txt en apache-postinst
 		fi
 	fi
 
-	if use http
-	then
+	if use http; then
 		elog
 		elog "Go to http://${HOSTNAME}/was/admin.php to configure WAS."