use gentoo init script wrt bug #425716 and remove all old

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

4 files changed, 21 insertions, 106 deletions

diff --git a/net-firewall/pglinux/ChangeLog b/net-firewall/pglinux/ChangeLog
index fbe27c03b345..dcfef3f4fef8 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.6 2012/06/26 22:54:52 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/ChangeLog,v 1.7 2012/07/11 14:13:31 hasufell Exp $
+
+*pglinux-2.2.1_p20120711 (11 Jul 2012)
+
+  11 Jul 2012; Julian Ospald <hasufell@gentoo.org> -pglinux-2.2.0.ebuild,
+  -pglinux-2.2.1.ebuild, +pglinux-2.2.1_p20120711.ebuild:
+  use gentoo init script wrt bug #425716 and remove all old
 
 *pglinux-2.2.1 (26 Jun 2012)
 
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 10e84240b896..f7fc84c382f9 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST pgl-2.2.0.tar.gz 584773 RMD160 648b57d461184d10e5300dc05bf18b744c1b6933 SHA1 fd595813dc3f2fd3b3bbf65b4bc6c45dfefc2815 SHA256 e31d4274def8ec2acec0acb80b111f83f415440c20f24d4e26851f0e65326f3a
-DIST pgl-2.2.1.tar.gz 588619 RMD160 bfa532861a3981946c9ecf62165ead00a64c4a5e SHA1 f6448d284d5a078619943b912aca111a00472d17 SHA256 2b61333055be126bcf8eccfa8c532487f8fd36ea80fe9bcb63475148979aaacb
-EBUILD pglinux-2.2.0.ebuild 2179 RMD160 6875b2e9412f74a01869c73d34a0c5fd443a6308 SHA1 e5745ef019881c3d35eba85c7c789bb0639ac87a SHA256 1cce10bfa6503f92747d044d6fc11608f449efbba598f8cf52fc987ea01fea76
-EBUILD pglinux-2.2.1.ebuild 2179 RMD160 bafa50441d2b53a86844bf93ff78d66569327fcf SHA1 5b95cba00f072ba84f02142920d19a3f5937843e SHA256 1e71059f6c612f2642b82b7ee2a811f3432cecc7f34e36d613c040c5d96cb225
-MISC ChangeLog 1102 RMD160 76ca08b60dbf484a683648e1326ea180860b90b3 SHA1 78cb2c6b9a83617a7182f34abf302c343f8bd9ea SHA256 f8de2de06a5adf58b8c09a78aae2fb412f9818e60a0adbee018c5da8f834d074
-MISC metadata.xml 915 RMD160 4a07fe3d6570c2fc6c4e87b3c5eaf831c1793494 SHA1 d00dfaad1ad3a5909b62cb0ef8081dee418c3369 SHA256 0ef1b7936761cd46bb7ee814cf32008f027e70dde530864381406ab53622c038
+DIST pgl-2.2.1_p20120711.tar.xz 412840 SHA256 cc32046e4ae6b4441b5135a951091c5dc9603a6b89f8f16721f60200a600a434 SHA512 bbde8d990253db97093969aeddc0466e3c0a0c3b008a67f9779ae2a47436be939751522710a69bd7a7d7c299235a60c886f8a36e99ea8bffcfa319d697e0c20f WHIRLPOOL 6abe0f35b647890ea6cff8368060954b2e6fa52ff7d58e5976eecbde495c4e5e7695fe3a025ce357e7b4b68b437a37949046293e50f60e610b9265dca8b6db0f
+EBUILD pglinux-2.2.1_p20120711.ebuild 2220 SHA256 708c152cea468d1917336850c7a0fabf8eb1fd6aeb9c32127796e536695a76dc SHA512 9f674c98eb20f9e7d5428f2a835751199a634e9d68f05ab9833f4d2af5d8b0b6d7c413a7336b58c1295c9a6640ef112f25b68c258d8d0f6f4b2ada0020558b28 WHIRLPOOL c154ff6e48698efb1bda8b2f2f51120ef27d98c58a27afd21945c5db9fb187e0480b2de6488e575af42eff835ef88621a01f4a8e5c7a12ee031968d0b4d4e16a
+MISC ChangeLog 1335 SHA256 ca9c2eff830723737c7ab0ca4e119323be91475b1e855293fc7b091e4042e3b9 SHA512 c472db58137f2b8a15476e85d0f19f55120a60c3188a7179db354e7477f002607d7245b66eebca7f5100b8a6a51255f717e4707259e93b22e758b738167633aa WHIRLPOOL 8ac64fc42343a07081d71eeacb96c8b06f47176fbf82da8d477505ae728dbda6b3faa8bebadc1c6c03cf385e229dd2a06c11a4f8c1a7336b9bd3ef5fbc4d34fb
+MISC metadata.xml 915 SHA256 0ef1b7936761cd46bb7ee814cf32008f027e70dde530864381406ab53622c038 SHA512 ae6f613e286cb8df3bdfff0657849a449ba97740155bd956894f436bb459293163f59414c76ad17e2d118a8cd929701c1e5f7ad946f63d5b13c6d6fd99c47936 WHIRLPOOL 69abacd370b80648b2cf320a107bb0804a2e6c0d6a041ae5eb0502bb5267e1db79f0b7efbeea48105ca04b19f9c401ce9e78e8e8ff6059fb90776b383bc611e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6jz2AAoJEFpvPKfnPDWzkVUH/0ll91K8WkymsEnqwbs9DWeQ
-11ZHvTlZHOeOdelY3RWFZ9K4/jzpsZ/JmxBhVKpc6DWa8qyvp5bkhDbH8C/hig1Z
-vtqqQt7Zwj+tQB8fZTwmdpRz3/4UUTyKyaXajJ5aBbrPqZFPk1laxt9AIto5cdI2
-0IIBAGUxtDaf+5Vn8TPrNPLIKWWCOA4q4pdyboPFMSGtYCuoN4A0ruhhLXmPAg2M
-/4hc1uhlKAC3hLZlt4j1oK685OCt7eyLD++x66xxmAnz8YSYSw97BziLHDnQp/GN
-9HM6s2JqL3uiUKCVnXeM2Y7Ac63pksbijSVOGbvGaO3dA0S4/D7ZVzNocWsExrc=
-=pfxT
+iQEcBAEBAgAGBQJP/YkuAAoJEFpvPKfnPDWzNskH/j34esi1ZyFshafZ+YzNBTDY
+EwMinwOEMnkYCw+N7kYyQ0obviD3rdlb+IYspcYbx5hACWkFqPpZKFCb4f0WKIzW
+WXFb9fJ7wszGUHY+zYCcUhqg1IPjaNIsE+WK7DZhFqay+rsrW/lHbP6V/It5ooA5
+OF5pnUuwjGVUmGz5OKQxBdPLXjpiqfb6VnZWkWQ4DC402dR098BxJpmgRDiH2I3t
+y0YsJBX/o8b2q1R7BR16rzIb1Ra01LRx8uAbZZ2CoJpmPSqwPbz1XG9F6hxtWhSM
+X4E4Fw30BaoZrvu9g34HniKPTjWf7Ik3oPH8Er3mXW5e1JAf8qreCCnKwwa+yAY=
+=t3X8
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/pglinux/pglinux-2.2.1.ebuild b/net-firewall/pglinux/pglinux-2.2.1.ebuild
deleted file mode 100644
index 2f329703e980..000000000000
--- a/net-firewall/pglinux/pglinux-2.2.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.2.1.ebuild,v 1.1 2012/06/26 22:54:52 hasufell Exp $
-
-EAPI=4
-
-inherit gnome2-utils linux-info
-
-MY_P="pgl-${PV}"
-
-DESCRIPTION="Privacy oriented firewall application"
-HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="cron dbus logrotate networkmanager qt4 zlib"
-
-COMMON_DEPEND="
-	net-libs/libnetfilter_queue
-	net-libs/libnfnetlink
-	dbus? ( sys-apps/dbus )
-	zlib? ( sys-libs/zlib )
-	qt4? ( sys-auth/polkit-qt
-		x11-libs/qt-core:4
-		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4
-		|| ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss )
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool:2"
-RDEPEND="${COMMON_DEPEND}
-	net-firewall/iptables
-	sys-apps/sysvinit
-	cron? ( virtual/cron )
-	logrotate? ( app-admin/logrotate )
-	networkmanager? ( net-misc/networkmanager )"
-
-REQUIRED_USE="qt4? ( dbus )"
-
-CONFIG_CHECK="~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_TARGET_NFQUEUE
-	~NETFILTER_XT_MATCH_IPRANGE
-	~NETFILTER_XT_MARK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NF_CONNTRACK
-	~NF_CONNTRACK_IPV4
-	~NF_DEFRAG_IPV4
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_TARGET_REJECT"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--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.))"
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-firewall/pglinux/pglinux-2.2.0.ebuild b/net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild
index e6a7cd56313d..621c20803bb5 100644
--- a/net-firewall/pglinux/pglinux-2.2.0.ebuild
+++ b/net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild
@@ -1,6 +1,6 @@
 # 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.2.0.ebuild,v 1.1 2012/06/12 22:22:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild,v 1.1 2012/07/11 14:13:31 hasufell Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ MY_P="pgl-${PV}"
 
 DESCRIPTION="Privacy oriented firewall application"
 HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -68,6 +68,7 @@ src_configure() {
 		$(use_enable dbus) \
 		--disable-lowmem \
 		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps \
+		--with-gentoo-init \
 		$(use_with qt4)
 }