net-analyzer/ipac-ng: version bump.

svn path=/; revision=489

3 files changed, 34 insertions, 35 deletions

diff --git a/net-analyzer/ipac-ng/Manifest b/net-analyzer/ipac-ng/Manifest
index 9953e2a..eb2d2ff 100644
--- a/net-analyzer/ipac-ng/Manifest
+++ b/net-analyzer/ipac-ng/Manifest
@@ -1,10 +1,10 @@
-AUX ipac-ng-1.33-as-needed.patch 1536 RMD160 ed89002b59190f53256274c1af6375dd2fe19c4e SHA1 2738593a78d97853e32628ca874d58a0ba766918 SHA256 8fbb3017e4ca6548d4c0a3f96603b18b7f25b88bc761f906849f2937f4da2a64
+AUX ipac-ng-1.34-as-needed.patch 1503 RMD160 000ddceb09201d0b83fbb38b63e804dd02a7433d SHA1 ea818b50f0b6203e6d4b70300a6e16b56d92916f SHA256 c79d624dbf5bd5e5dc50d8182a1042dfb39e7934b1c601c2790f106c83461914
 AUX ipac-ng.cron.1.30 216 RMD160 a34013742e76d77d0ca5cab75d96ead99ac04ae7 SHA1 e3cee763184634203e2dc68fcc499b8b24bd2e92 SHA256 fe741234fcc84fa9823ebc000bf7cab952b906dbbb9206432398b21569e580ec
 AUX ipac-ng.rc.1.30 897 RMD160 6f8afec9d8a3a8065578a95152e5d6d931d5cc71 SHA1 87d4caf973f7f62bbe42dd908c3f8d1df82d7562 SHA256 6db10bc0c47267f79ac0fe438a45296e766b4c41b284f2dda7b850dc61eb9832
 AUX ipac.conf.1.30 1820 RMD160 513e3e2d9bd9f9e281b68f3a27c717bbb0fe213a SHA1 a415aa4ccba62333b4942d08c21ab5f54b42140c SHA256 162c7e44c9c39341b0c8b1982cc190985c40441164fd7abd48b5e7318f8b05d6
 AUX rules.conf.1.30 1046 RMD160 a1dffd63f1bcc8e2427775182f56b2bdfc69a869 SHA1 6d97977481aa45f845bf97085a8e6228359a8532 SHA256 714cea1d01128c630c9a53110188877ea3a77b028fb12900b6252e793cdaee5b
-DIST ipac-ng-1.33.tar.bz2 198237 RMD160 caa285eec47e22c9448e9003b614391bd64da048 SHA1 23023bbb4c08c171dc3e35708606a9f275dc6d46 SHA256 fef230101d820eb4f394cae2f950942b771a264fa6e59f467d74df0cfbe8b84d
-EBUILD ipac-ng-1.33.ebuild 2687 RMD160 186b8f76222b4e3ebae4d97498ca7382c2bfbf3f SHA1 0b3d74c7923d5c6e4af4399356303789b011f16d SHA256 0a3de28068a28a04aa72c11921d4d595d2f4af066ba4f837a2fc4f5772436d3d
+DIST ipac-ng-1.34.tar.bz2 165996 RMD160 1acb776f98734a8e932e7f290e1e610004d901d4 SHA1 07d9ee805861ad724e784b6015830290adfc23fc SHA256 10d0f2788c3b1a0bbde17d3b6fd14529109915e26ce41e6e598ac81d321f9b0e
+EBUILD ipac-ng-1.34.ebuild 2613 RMD160 dd4a617769937d1679e24a0d56a4225dd05bb544 SHA1 bf4d0a6beccbe8787dc7f858d16daff870d7b221 SHA256 07702fedc05e3a8c69cfc072b638d9733d46a3f10a8096d1141795b8060f064c
 MISC ChangeLog 5228 RMD160 dd8c4de3cd264b32dda6d99ab7faaff30055fa78 SHA1 313a8f29ccdfd034b82a18986a6f2b2eaed8c783 SHA256 790c7bd4d0fb4b63e62629bae3e892aabe97208103dba75deaa8e6c546da248e
 MISC README 2800 RMD160 da520294ad10edf091b431a756870e447ab3e0b5 SHA1 303f1b7b26d03dbe8de4ed164796668fe010586f SHA256 e76e0a1bd2f9511678b1b5ff4d06fde8991bb8dc364cce929a29b3bbe7a6a19b
 MISC metadata.xml 286 RMD160 92f59ba848186619ed6753f6cbbfd8deb3052092 SHA1 f04be974c4bf21f3dad4a34abb3ef205726715ae SHA256 b68c20680aaf86f9886146aad86f532a115427854196c394aebf96725aa660a3
diff --git a/net-analyzer/ipac-ng/files/ipac-ng-1.33-as-needed.patch b/net-analyzer/ipac-ng/files/ipac-ng-1.34-as-needed.patch
index 962757f..e94586c 100644
--- a/net-analyzer/ipac-ng/files/ipac-ng-1.33-as-needed.patch
+++ b/net-analyzer/ipac-ng/files/ipac-ng-1.34-as-needed.patch
@@ -1,36 +1,36 @@
 === modified file 'configure.in'
---- configure.in	2010-05-08 09:29:45 +0000
-+++ configure.in	2010-05-09 12:30:54 +0000
-@@ -96,7 +96,7 @@
+--- configure.in	2011-05-24 13:09:44 +0000
++++ configure.in	2011-05-24 13:10:12 +0000
+@@ -102,7 +102,7 @@
    test $HAVE_LIBSQLITE = no && AC_MSG_WARN([sqlite library not found!
  	support for optional storage \"sqlite\" will be disabled])
- AC_CHECK_LIB(dl, dlopen)
+ 
 -LIBS="$LIBS -L. -lipac"
 +LIBS="-L. -lipac $LIBS"
  
- 
  dnl Checks for header files if libraries found
-@@ -248,7 +248,7 @@
- 	test -f "storage/$sm/configure" && \
- 		    configure_dirs="$configure_dirs storage/$sm"
+ HAVE_POSTGRE=no
+@@ -251,7 +251,7 @@
+ 
+ 	storagemethod_makefiles="$storagemethod_makefiles storage/$sm/Makefile"
  	STORAGEMETHODLIBRARYS="$STORAGEMETHODLIBRARYS storage/$sm/libstor$sm.a"
 -	LIBS="$LIBS -Lstorage/$sm -lstor$sm"
 +	LIBS="-Lstorage/$sm -lstor$sm $LIBS "
  	dnl check if the storage method requires any libraries.
  	test -n "$ADDLIBS" && LIBS="$LIBS $ADDLIBS"
  done
-@@ -308,7 +308,7 @@
- 	test -f "access/$ag/configure" && \
- 		configure_dirs="$configure_dirs access/$ag"
+@@ -309,7 +309,7 @@
+ 	fi
+ 	billagent_makefiles="$billagent_makefiles access/$ag/Makefile"
  	BILLAGENTSLIBRARYS="$BILLAGENTSLIBRARYS access/$ag/libipac$ag.a"
 -	LIBS="$LIBS -Laccess/$ag -lipac$ag"
 +	LIBS="-Laccess/$ag -lipac$ag $LIBS"
  	dnl check if the access agents requires any libraries.
  	test -n "$ADDLIBS" && LIBS="$LIBS $ADDLIBS"
  done
-@@ -384,7 +384,7 @@
- 	test -f "agents/$ag/configure" && \
- 		configure_dirs="$configure_dirs agents/$ag"
+@@ -383,7 +383,7 @@
+ for ag in $ACCAGENTS; do
+ 	accagent_makefiles="$accagent_makefiles agents/$ag/Makefile"
  	ACCAGENTSLIBRARYS="$ACCAGENTSLIBRARYS agents/$ag/libipac$ag.a"
 -	LIBS="$LIBS -Lagents/$ag -lipac$ag"
 +	LIBS="-Lagents/$ag -lipac$ag $LIBS"
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.33.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.34.ebuild
index 996050f..2108763 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.33.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.34.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild,v 1.10 2009/01/15 05:25:43 jer Exp $
 
-EAPI="2"
+EAPI="4"
 inherit autotools eutils
 
 DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
@@ -41,8 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--enable-default-agent=iptables
+	econf --enable-default-agent=iptables
 }
 
 src_test() {
@@ -50,20 +49,20 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" install
 
-	dodir /var/lib/ipac
+	keepdir /var/lib/ipac
 
 	insinto /etc/ipac-ng
-	newins "${FILESDIR}"/ipac.conf.1.30 ipac.conf || die
-	newins "${FILESDIR}"/rules.conf.1.30 rules.conf || die
+	newins "${FILESDIR}"/ipac.conf.1.30 ipac.conf
+	newins "${FILESDIR}"/rules.conf.1.30 rules.conf
 
-	newinitd "${FILESDIR}"/ipac-ng.rc.1.30 ipac-ng || die
+	newinitd "${FILESDIR}"/ipac-ng.rc.1.30 ipac-ng
 
 	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/ipac-ng.cron.1.30 ipac-ng || die
+	newexe "${FILESDIR}"/ipac-ng.cron.1.30 ipac-ng
 
-	dodoc README TODO doc/* CHANGELOG || die
+	dodoc README TODO doc/* CHANGELOG
 }
 
 pkg_postinst() {
@@ -74,12 +73,12 @@ pkg_postinst() {
 	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
 	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
 	ewarn
-	einfo "the accounting database is at /var/lib/ipac"
-	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
-	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
-	einfo "fetchipac is run by cron every hour by /etc/cron.hourly/ipac-ng"
-	einfo "after you changed rules.conf you have to run \"fetchipac -S\" or"
-	einfo "stop/start the service so your iptables gets updated"
-	einfo "if ipac is not working with the default configuration make"
-	einfo "rm /etc/ipac-ng/* and rm /var/lib/ipac/* and emerge again"
+	elog "the accounting database is at /var/lib/ipac"
+	elog "use /usr/sbin/ipacsum to get your ip acounting data"
+	elog "use /usr/sbin/fetchipac to update the accounting at any time"
+	elog "fetchipac is run by cron every hour by /etc/cron.hourly/ipac-ng"
+	elog "after you changed rules.conf you have to run \"fetchipac -S\" or"
+	elog "stop/start the service so your iptables gets updated"
+	elog "if ipac is not working with the default configuration make"
+	elog "rm /etc/ipac-ng/* and rm /var/lib/ipac/* and emerge again"
 }