version bump, remove old

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 42 insertions, 23 deletions

diff --git a/net-firewall/pglinux/ChangeLog b/net-firewall/pglinux/ChangeLog
index d753ba785615..825b3ae53585 100644
--- a/net-firewall/pglinux/ChangeLog
+++ b/net-firewall/pglinux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/pglinux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/ChangeLog,v 1.4 2012/05/21 15:10:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/ChangeLog,v 1.5 2012/06/12 22:22:24 hasufell Exp $
+
+*pglinux-2.2.0 (12 Jun 2012)
+
+  12 Jun 2012; Julian Ospald <hasufell@gentoo.org>
+  -pglinux-2.1.3_p20120519.ebuild, +pglinux-2.2.0.ebuild:
+  version bump, remove old
 
   21 May 2012; Julian Ospald <hasufell@gentoo.org>
   pglinux-2.1.3_p20120519.ebuild:
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 1e1d8c8abb55..b8225fdf2135 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST pglinux-2.1.3_p20120519.tar.xz 407828 RMD160 42524167e58245e615049434cefcd9bf58a7e640 SHA1 baf29ba52fd148531798125007bd151207e57670 SHA256 9d868682fcc482e6dc728806082de7668ab6dab24deab0322766b56f7f42a99e
-EBUILD pglinux-2.1.3_p20120519.ebuild 2020 RMD160 024965c893553b84f1daaa92e3c4e1cef67244e8 SHA1 e11cc6b05ba2eb3d80c6573dff1c52c578776725 SHA256 64149499344de8ae3706255809414fa6037995c82504370815486f7c4d630746
-MISC ChangeLog 815 RMD160 6588025332f490458590c517fee92e5e2a948514 SHA1 e88a048bfbac30b672f23edab5e45a74592488bc SHA256 9ebac6a5566db01a24332bdfb060bbac8b9909f00aa695b8acbab85094178919
+DIST pgl-2.2.0.tar.gz 584773 RMD160 648b57d461184d10e5300dc05bf18b744c1b6933 SHA1 fd595813dc3f2fd3b3bbf65b4bc6c45dfefc2815 SHA256 e31d4274def8ec2acec0acb80b111f83f415440c20f24d4e26851f0e65326f3a
+EBUILD pglinux-2.2.0.ebuild 2179 RMD160 6875b2e9412f74a01869c73d34a0c5fd443a6308 SHA1 e5745ef019881c3d35eba85c7c789bb0639ac87a SHA256 1cce10bfa6503f92747d044d6fc11608f449efbba598f8cf52fc987ea01fea76
+MISC ChangeLog 982 RMD160 842c2b09b019eb0456a10d002e5878648fcd226c SHA1 bd8ce7b272a0cf453a8b5ce608f077f112b256a9 SHA256 3126f5c34183a5572de5e3a17ce7b5cd12670a9795c758c6edbfa7e8577c0e92
 MISC metadata.xml 915 RMD160 4a07fe3d6570c2fc6c4e87b3c5eaf831c1793494 SHA1 d00dfaad1ad3a5909b62cb0ef8081dee418c3369 SHA256 0ef1b7936761cd46bb7ee814cf32008f027e70dde530864381406ab53622c038
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPulphAAoJEFpvPKfnPDWzhJkH/irpkgo70a1nBLNqNZ9Bf7Oq
-E5dfpQLWI7s3tfJRmHBZYdImYyLad9mvAMKShivmdgdN8Z1bBSCdItDjYzym/BZF
-3US/eVtFaTHX84zGE1IehcWF0AriHbruXqWvT9Mp0eLvrMezw2L9VmDt22j3oxYQ
-NklLePxxDBWJD1vmq9esGYnNS/diU9GDbJS1+7hlHjfekTafgxAFTXsdPHACudL1
-9lolfBzciObjriV5Fetz8GnUhIYtsH9Sni5BIPOJIMtMbDotk9vrERUTyzfDMHEl
-7k7z9OckU06n9Y9k8OeElaNcMoNMmRxiGRGDMpB98B0BCGyvyvpmZp32t+UKx0U=
-=3Nlk
+iQEcBAEBAgAGBQJP18ByAAoJEFpvPKfnPDWzlOsIAKmr7+bhS6MCv3UvdaFp0p+x
+u8iv14pdFpkHPHVG9Wwz0C9XH38SIqg9XLjtJZe9OoZA0i5UsUKjpibto1hdQpMf
+SH6ym04PC8hVGiZz2Xl0LUZxYcZoSLj+hEmJKkiAov/pc8cGJcYzK/ak5UbttiQW
+w2a1ejn+0VQuNKf+ALe983US+yrLHnbzkCY3R62ekIuJASy8VBaP7aYUdqmhFIoN
+qwjBdR6Y+lfY4zVEYuCX8Dibs2qS3HMapCFyk1Q+rJpqQb11AyVLLc0pWCy0XIdJ
+0xmN7aqiFac5WvjsRASxQby8wYeWl2euXP60J7aTM9ODzQfT+1ZOl9uG1Z2zJDY=
+=IGbX
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild b/net-firewall/pglinux/pglinux-2.2.0.ebuild
index a6dfca91b138..e6a7cd56313d 100644
--- a/net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild
+++ b/net-firewall/pglinux/pglinux-2.2.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild,v 1.2 2012/05/21 15:10:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.0.ebuild,v 1.1 2012/06/12 22:22:24 hasufell Exp $
 
 EAPI=4
 
-inherit linux-info
+inherit gnome2-utils linux-info
+
+MY_P="pgl-${PV}"
 
 DESCRIPTION="Privacy oriented firewall application"
 HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -23,7 +25,9 @@ COMMON_DEPEND="
 	qt4? ( sys-auth/polkit-qt
 		x11-libs/qt-core:4
 		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4 )"
+		x11-libs/qt-gui:4
+		|| ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss )
+	)"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	sys-devel/libtool:2"
@@ -51,27 +55,36 @@ CONFIG_CHECK="~NETFILTER_NETLINK
 	~IP_NF_IPTABLES
 	~IP_NF_TARGET_REJECT"
 
+S=${WORKDIR}/${MY_P}
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
-		$(use_enable cron) \
-		$(use_enable dbus) \
+		--docdir=/usr/share/doc/${PF} \
 		$(use_enable logrotate) \
+		$(use_enable cron) \
 		$(use_enable networkmanager) \
 		$(use_enable zlib) \
+		$(use_enable dbus) \
+		--disable-lowmem \
+		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps \
 		$(use_with qt4)
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	elog "optional dependencies:"
 	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
 	elog "  app-arch/unzip (needed for blocklists packed as .zip)"
 	elog "  virtual/mta (needed to send informational (blocklist updates) and"
 	elog "    warning mails (if pglcmd.wd detects a problem.))"
-	if use qt4 ; then
-		elog "You need one of the following graphical su/sudo:"
-		elog "  x11-misc/ktsuss"
-		elog "  x11-libs/gksu"
-		elog "  kde-base/kdesu"
-	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }