Revision bump: fix bash completion, wrt bug #526300, drop old revision

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 68 insertions, 25 deletions

diff --git a/net-firewall/ufw/ChangeLog b/net-firewall/ufw/ChangeLog
index ac0e3f241850..73a83e83dcd8 100644
--- a/net-firewall/ufw/ChangeLog
+++ b/net-firewall/ufw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ufw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.15 2014/09/07 15:31:30 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.16 2014/12/15 11:07:41 pinkbyte Exp $
+
+*ufw-0.34_pre805-r2 (15 Dec 2014)
+
+  15 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> -ufw-0.34_pre805.ebuild,
+  +ufw-0.34_pre805-r2.ebuild, +files/ufw-0.34_pre805-bash-completion.patch:
+  Revision bump: fix bash completion, wrt bug #526300, drop old revision
 
   07 Sep 2014; Jack Morgan <jmorgan@gentoo.org> ufw-0.34_pre805-r1.ebuild:
   adding sparc, ppc, ppc64 keywords
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index ecdbd40febb8..4c88b8cde131 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,15 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rsyslog/ufw.logrotate 178 SHA256 02d1a00ca68446fbe056a4c3aede319f77b3262e26092cc04ea46de8923d03f8 SHA512 d381a34b23d8656c316af69c07d49042d6c4def4cea3e51367210bce20681376fd0259a95b6b9403171c5d80732927a8880f3d401e13e6f76b505324eecb146b WHIRLPOOL 10b63f8966ad7ad0894a18216a0102fc8a102b14c8f9fb468a4a8d61ae13b1ec3176c7bb9ffb852f8aaa4ac7874584a8f8f5a2d6e98fa3fb56f5945e9bd99139
 AUX syslog-ng/syslog-ng.example 381 SHA256 70a795c1b20e2cdef38565d74b9de042c6666f860a2fd1b3bdc6f31dd451bc68 SHA512 f48d2487679fe179ea216bb4259affbf5ab4c86725b45942581ada8dac24dd0c978f755182805ff5350ab169972fcee7bb54a6d14df760d4b5f62c485af1e49e WHIRLPOOL 44874c68257b6f9a53e7fd1affc6ccf2492d9ec09a4700a17239fb3e413e2dcf2ede87eafb1e253d965c27a1c5ead36c413c8c84ec3ed55f5cf2191b927aacbe
 AUX syslog-ng/ufw.logrotate 269 SHA256 cddd86613bde19b45f0f935c65bb43721f69aefc14e7d629612b23ea3b5c5c97 SHA512 22d89f04b68a8b4deeb60aca263239255dd01b9c6e6d23a5d77514daf7bb9dc3910a28cfe9c606f70d2a50f0365bb19c3cf00c5859ee2630c00f0df451ee9c5d WHIRLPOOL 5da4f8c615667d829ea4eb318ec01b712adf69002dcf8c3df7deba8fa3e49e426b1c00e468805ba571ed2f2ce05fa81b7e2ac83e7231de3f3305d6ce190264e5
 AUX ufw-0.31.1-move-path.patch 7071 SHA256 88a7b20696b731bac01b3c5d88b0353842b1228d3239cfebe1f2a47c1bdb6768 SHA512 66382ded35437e563c874dc01417a2735a2aa136a1e670fd3707c3311516a6d9a0e62a20679a4f5dcaa2edc0225535cf2410d7f86676b1e10eb309ecc3e24bc2 WHIRLPOOL 89e3165900def8380cade3eb62fc351be9e43c8055f4b71c356f3aa5356b0c57154e18485d94e0ca86462da7c55b1b4755de379a88f1958d313b93c0ec723715
 AUX ufw-0.31.1-python-abis.patch 1872 SHA256 1e3094135d71e7e7129b2d268d79c73990f0a6f61f2bb6456d3f3654b4975463 SHA512 fbe65a6775426c66cd82382e62eea3a2179d68a0b6c617cc468e7076e2f58493baffde686b65e6bf3a89ea7fdda48a5a42d152b1be388c943408532f47d4402a WHIRLPOOL 62e68d1ef8aaa4963765599ca6701af18bcdef8f6a20607ce433b5294baa9c5ba75b3d41266d9a8bd82febe3a3ac75c6fcb2326fbc5cafa31634ec96a4407b10
 AUX ufw-0.33-dont-check-iptables.patch 1659 SHA256 8a3ae20d399e83aa9c779dfed1f65d99b277263681b1a3e7e9e86143d5fabd0a SHA512 8f92d4b79f1caf01cb97ec64014c7607a410fb0a36e5e87376707c026d714a060ae554591b6e5b3834b671acd4145dcca68a9373aa41051ef60c9dd409dd008d WHIRLPOOL 8f897654bde85d84b17dc32507c5a469fe04eb2201acb55bfd02a76346620399dbcb9c7d0ce19f48285f6eec5de0a5d96420483d6a0b7a4c31a41fa329f91180
+AUX ufw-0.34_pre805-bash-completion.patch 255 SHA256 673ee8092b1a41a78bfbfe68ab6f97665b821861b5be44fda3cecf5e3ab57acb SHA512 e3fceb0cbf683b82e9d9aa0aa0c41b1cde9aee59b6dd2d06ca80de0b980231fd999bdff3b2705f7ff8e90c9f2cc84a4ee11b34530630cf77a170ecfbf028550f WHIRLPOOL a267de2cc5615fdb9eac29fdcd4fade22ec3fc54bb6823c91965b0c7e668dbf4e19dc8d5f6fb8fca2be3700f4ac2c7bb71ee27f20d07b3fa1c1d528273ade63f
 AUX ufw-0.34_pre805-shebang.patch 675 SHA256 4348689359f3d80c1bcfe66d12710578ba31a5382bf078242b84e86f7233e38d SHA512 8954f679a993d65cb880ffce09b448626fd64dea93257f0faa97b8bec76dcbbda4fb0d19408655d6db387066a0ac94b962dca2e5febcc5b5685e9b16b97b4cad WHIRLPOOL 44c83c5e1795fa0db7ed40d1440df7b4220b869bd42a294ba0d8262fbb2b2e114154d0ce9a22e100db8ad7c1cd402eefacfe854679e7caecda4a251d98720f03
 AUX ufw-2.initd 2722 SHA256 657b5305923b2a5de9eb96931aaaa28d6e997ace6c40793d905887798094258c SHA512 54cb84ae5ce2c327a7a7b03deeed3d7507a4716ce929aa563d4fb5baa9aa73d95575ec7d5db7165345310869bd5a60b1033c6691f02a85ab94baa6b4a550daa7 WHIRLPOOL c19a21c93f0c63165715e8da4ab9b16a4596ccc3730118c1bbd7eb4de9a94b2b1475904818a2786b2490a07dee7d761da28ca6dc087926c27598d691cb333ce6
 AUX ufw.confd 219 SHA256 069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 WHIRLPOOL e6c4537392921c63f8a57fab7ea269fbeea846468ef8968816d988556557495e8abb77aee9d60648a1483a599683613cf5ea832cbcf498a8828baa9abcd31752
 AUX ufw.service 329 SHA256 1c600d9b9425485a0536fdf77a39fbf94bfcaade686789d6c4f3f1aac08ffe69 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7 WHIRLPOOL a00069a5582b9c52b5ff9a9c88b03294140dd06596ea0fbcbd0e7f6de016b1eed97840728c932a82f18762c84c9e8849f86ee504b49931420f2d097bb9b0ebd6
 DIST ufw-0.34_pre805.tar.gz 335875 SHA256 a78693da04720f9f7eb463447b940eed18c3e2c20d3de336ebf9bf821dfdac2f SHA512 b8bba3bb8c423070d6434d1df7274423edf3a356415f54c6448fa0ff2d13a4b2ac21c4bb627cba01d6955b04f793eeaf2fc535c6221e7de48f11bef745035263 WHIRLPOOL 5e5238925d928e883c9869b3b72a7a04ad18352ebbcb5fead9b14c7bb5225f1bbae613d9117ceb5e9d435e1ca1f1d0d033bbdf673896990eda5efcb7a7d04829
 EBUILD ufw-0.34_pre805-r1.ebuild 5420 SHA256 d5f819d4f8a4dc1e3721022467fba32a623db861a547cb256d72329a38ae7f3e SHA512 7cf43a53ce2eab50ffb0a0d777ed8ace60ef72f4b57afcbd63341afab1290147435491f7c01ccf592d42ab0d202fbf63c9f39f11bdf4452cdfb92c5f921b85f6 WHIRLPOOL 77c2c7a2bc3e86b5dbb539db0d2aaeb844a877405a5c2f0c23f9c7ec9c8110e5e19c4c561c11b1ba8b7af519011dd970ea964c122a713ce0b43c4d6a30d08598
-EBUILD ufw-0.34_pre805.ebuild 5415 SHA256 2a5191348122b729d4cefccb4f65e9714c704e61afff25dcedc530e12284c5a2 SHA512 378e32a0e135eafc33cb2134a26a0fa9590b86d9abd8008bb7086d0739a0e106f36cc127069d5145659dce9607734b6344804dc0b3914ae7efdc867885c1b504 WHIRLPOOL 13cdf52c7824fd06d407e0e3bd8333fda9dc7f6af2164b6cfe1ed95fab4ddf313df347c86793ee9e4d26b805bcd7118e4c38cce4cee2041ea5fe15900f51a788
-MISC ChangeLog 3897 SHA256 5eb2106de070f3dd1f60ca3d99b73f545bb57a95f5ddc475b51b1c45b39e32a2 SHA512 b6bd70a4d9c1d112f01a3a5dcada7157d3550136f85df8e6989e349adf2352da5e85afd0b83e136c90cf34dd2e18c133d58f4b77e44f208fe23bd06578dbe83f WHIRLPOOL 323846dde4bd5b05b86335f81aa2b30cc3fc716fcf2389824447f3d6548576e61fae6b928f6b44d2331c8adad8dc8db69bbca2ddb8438f55ed5c7ad521fad68d
+EBUILD ufw-0.34_pre805-r2.ebuild 5500 SHA256 92c282a3949e22f62bc85c03a0beb89821229c79d1a70169e05c17f7ced7aa33 SHA512 45fac8ddde827110f0ed3648a828a32f8f29269e574400dfada5b0c45d941aaf10d119449c7b849d13863664bcfe4d6f218a521532fa861dc00c1865c8b67977 WHIRLPOOL 619d857d4080c60f1ca0e1b2e76df4fc1190a05fe7000c986de4e8da2cf301b6982ce9b61db9a66f2ea562f9e3627ea6f8e9d6df320032af58283ffdb3f71745
+MISC ChangeLog 4158 SHA256 6f279533803ac63fac9e9bc42b03665394199d6f2f726f1f76215b5165c51574 SHA512 559bbb00eaac7b34b66465e3c23a0714a369a740065d06daffb59861948f614f7b67d80ad9d31e6f1b82a26fefcf55c97a16688e73d70b01a122d9180eb6fdff WHIRLPOOL 67fb084beeb0e49f6df582d3b1000d02041a83a9958d1e8904cbc26284d05c570fbd33188fea61f022f9300be4943dbb3ce4020ff1cbb4ef5700b2d4195ab352
 MISC metadata.xml 568 SHA256 0fea99101adbd93b9a644642cf668a7cb5d6392c840b66b4c8aca504985c4033 SHA512 5ac4c205a5df4c0bf11f22d442457c5a50535ebf007fb01bb07e9480f9d854eb053bdd220519e37e0602e1d3ec0043bab7e1865bf9c2e8339b76538719285e96 WHIRLPOOL 122348f9b736392521b10685d03ce3105abec78c8a1378ed1e1b86f9bf6097b1b6be66ce172e1cc92e813c21c8722a4f44e52ee63bfd2c327c9e2c844faf1d13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUjsD9AAoJECo/aRed9267kU8H/11YKjEyQc/VTyH3ErShWuH7
+B9WGij20PtrF7JCLtuNbMv7shV0nPlk4zl8XcilKUC/hluP7ImbiSBHmrI5D/f9N
+imNhWRL5JOO7vSua2ENU13iqLUz3jKcJlH5IBMXYPOMbUGCIRjJA6F1EAiyIF7Ni
+J7cogX9KiZ88C65AMMoxseYcgcnypd/ZR1Hpp2VdCROypN4r2qK01Re40bSEHLGb
+rhlWcVJWuvedr/ns3y7nv3zbFMPpkdBXi+6VIXa8xYiE2x2jnOxO/d9dumByJ2c0
+QJAXfxe66gzijxM6BV0qo8MRwkoP7C1BSRGl6tYX3Usnd2b5IMQpT713wjAejH0=
+=joPi
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ufw/files/ufw-0.34_pre805-bash-completion.patch b/net-firewall/ufw/files/ufw-0.34_pre805-bash-completion.patch
new file mode 100644
index 000000000000..dc922435de10
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.34_pre805-bash-completion.patch
@@ -0,0 +1,17 @@
+--- shell-completion/bash
++++ shell-completion/bash
+@@ -52,7 +52,6 @@
+     echo "numbered verbose"
+ }
+ 
+-have ufw &&
+ _ufw()
+ {
+     cur=${COMP_WORDS[COMP_CWORD]}
+@@ -83,5 +82,5 @@
+     fi
+ }
+ 
+-[ "$have" ] && complete -F _ufw ufw
++complete -F _ufw ufw
+ 
diff --git a/net-firewall/ufw/ufw-0.34_pre805.ebuild b/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
index 8b714b5b31dd..1877eb814164 100644
--- a/net-firewall/ufw/ufw-0.34_pre805.ebuild
+++ b/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.34_pre805.ebuild,v 1.2 2013/05/20 09:05:50 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild,v 1.1 2014/12/15 11:07:41 pinkbyte Exp $
 
-EAPI=4
-PYTHON_DEPEND="2:2.6 3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython"
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+DISTUTILS_IN_SOURCE_BUILD=1
 
-inherit bash-completion-r1 eutils linux-info distutils systemd
+inherit bash-completion-r1 eutils linux-info distutils-r1 systemd
 
 DESCRIPTION="A program used to manage a netfilter firewall"
 HOMEPAGE="http://launchpad.net/ufw"
@@ -15,7 +14,7 @@ SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples ipv6"
 
 DEPEND="sys-devel/gettext"
@@ -27,6 +26,17 @@ RDEPEND=">=net-firewall/iptables-1.4[ipv6?]
 # tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
 RESTRICT="test"
 
+PATCHES=(
+	# Remove unnecessary build time dependency on net-firewall/iptables.
+	"${FILESDIR}"/${PN}-0.33-dont-check-iptables.patch
+	# Move files away from /lib/ufw.
+	"${FILESDIR}"/${PN}-0.31.1-move-path.patch
+	# Remove shebang modification.
+	"${FILESDIR}"/${P}-shebang.patch
+	# Fix bash completions, bug #526300
+	"${FILESDIR}"/${P}-bash-completion.patch
+)
+
 pkg_pretend() {
 	local CONFIG_CHECK="~PROC_FS
 		~NETFILTER_XT_MATCH_COMMENT ~NETFILTER_XT_MATCH_HL
@@ -93,16 +103,7 @@ pkg_pretend() {
 	fi
 }
 
-src_prepare() {
-	# Allow to remove unnecessary build time dependency
-	# on net-firewall/iptables.
-	epatch "${FILESDIR}"/${PN}-0.33-dont-check-iptables.patch
-	# Move files away from /lib/ufw.
-	epatch "${FILESDIR}"/${PN}-0.31.1-move-path.patch
-	# Contains fixes related to SUPPORT_PYTHON_ABIS="1" (see comment in the
-	# file).
-	epatch "${FILESDIR}"/${PN}-0.31.1-python-abis.patch
-
+python_prepare_all() {
 	# Set as enabled by default. User can enable or disable
 	# the service by adding or removing it to/from a runlevel.
 	sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
@@ -128,9 +129,11 @@ src_prepare() {
 	else
 		_EMPTY_LOCALE_LIST="no"
 	fi
+
+	distutils-r1_python_prepare_all
 }
 
-src_install() {
+python_install_all() {
 	newconfd "${FILESDIR}"/ufw.confd ufw
 	newinitd "${FILESDIR}"/ufw-2.initd ufw
 	systemd_dounit "${FILESDIR}/ufw.service"
@@ -150,13 +153,15 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*
 	fi
-	distutils_src_install
-	[[ $_EMPTY_LOCALE_LIST != yes ]] && domo locales/mo/*.mo
 	newbashcomp shell-completion/bash ${PN}
+
+	[[ $_EMPTY_LOCALE_LIST != yes ]] && domo locales/mo/*.mo
+
+	distutils-r1_python_install_all
+	python_replicate_script "${D}usr/sbin/ufw"
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		echo
 		elog "To enable ufw, add it to boot sequence and activate it:"