From 2cc64c2cf4033c7f9ea7fa04c95cf9848dac642d Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Mon, 13 Apr 2015 06:32:32 +0000 Subject: [PATCH] add py3.4 support, update python_export_best to python_setup, no need for revbump, fixes Bug 530996 by pacho Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- net-firewall/firewalld/ChangeLog | 6 +++- net-firewall/firewalld/Manifest | 22 +++--------- .../firewalld/firewalld-0.3.10.ebuild | 36 +++++++++---------- 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog index ba2dc059ffdb..f73f505cf29d 100644 --- a/net-firewall/firewalld/ChangeLog +++ b/net-firewall/firewalld/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/firewalld # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.15 2015/04/08 18:16:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.16 2015/04/13 06:32:01 idella4 Exp $ + + 13 Apr 2015; Ian Delaney firewalld-0.3.10.ebuild: + add py3.4 support, update python_export_best to python_setup, no need for + revbump, fixes Bug 530996 by pacho 08 Apr 2015; Michał Górny firewalld-0.2.12.ebuild, firewalld-0.2.9-r1.ebuild: diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest index 0c7b8dd02775..d26e8e9825a7 100644 --- a/net-firewall/firewalld/Manifest +++ b/net-firewall/firewalld/Manifest @@ -9,25 +9,13 @@ DIST firewalld-0.2.9.tar.bz2 280445 SHA256 106fd985074a74bbd84a3c866fa4023693b18 DIST firewalld-0.3.10.tar.bz2 548013 SHA256 0f5e051655fc06690f5ab72b1b38cb57b4368e49bd5ad98a27e2f88c79e82f2b SHA512 3fb3363959203d90d51b2c9b7b7819a4f3521a51a10a59d73d65054018e1fe90d0fdd2e31d0b83a3d38e2b2fd6e92fccd6dd2a30ec7f1be3f98a018a5a49aeac WHIRLPOOL fc6d1ceeb4e5ba91b072526ffa2dd7a790d883176104bec6e7e547b9035757ff22743746389f50edd32d646a07e9bf311b109f89b8c59acfa350e71176d0bd3c EBUILD firewalld-0.2.12.ebuild 2096 SHA256 2b385baef111fce428ea8cd0e280fdc661222badbefce6604833c43e07ec032b SHA512 66ad0fcc383f49625e9deb6834f6a0d43a7626da8a67e5ddbcdd2d4222c37d721f10cf4517be24702bc3bc3b11f96b44cf8771c300ac0f260afaad775cd57b25 WHIRLPOOL 675744791498c29274b64f6a49605e623cea1729411284c50eadaff783d07dbdc64d20749cdeea8c8cbc6989acf615514986c7263580a0a4d98325c2dec070ea EBUILD firewalld-0.2.9-r1.ebuild 2095 SHA256 8a5e4b59f4e5a971154b978ecbe84c35c8b9959f91f894b93ffca64013144ba6 SHA512 5abaf09215da761de9d3899ebf52a3104aa46594b2d1708f5d8cb35424e2bb4606539532552f95d553244b311ab5d7e35db7de3736b4237345981962cacc35b0 WHIRLPOOL 8ab7dfd789bcf3d798eb1ff407cbfc77d3993b2b9fc6044ff95b9c62546365d4ff12e3d1d9e0c5b0c247badd664cd9fba2941c956e61c03fe14ebc2adfbdcfc7 -EBUILD firewalld-0.3.10.ebuild 2645 SHA256 8694942f60bc5a4ba6c2d1c1e634c4f574cfd19d72969313c81ac36f71ea0930 SHA512 59513b433afcdf2908773ed1aa14810d8d510a45b24df02bd8214b4476832088191aa298da518756fc60fe54963ea955eaa58c79cd6af973365e443df7d00045 WHIRLPOOL b4b6abbca53f3ece450d5abe7ef38fa1bef5b938323bd8e3c772ac488a7027c65a6f3ef362bb8fc973559659904628ab217ac845ab428785c084f52458f852ba -MISC ChangeLog 2459 SHA256 cf341eed178752c9eda7ab7f1aec6facc961ed8a26140c727d272509786ef06c SHA512 b85efaa1e5d418c275372f5945401eb7ff1765bcbc94db0977bb42c150601ff9257485ae2779b79a176d7619860198359e7d741ab24680ae2784c6984d7c304b WHIRLPOOL 3e9840a67ae7ef27a408c2fad205f0677d311685a8d9805bfd3e4b972201d928cf60ec3c74c1f8bcf325b6463ca90851e36d3a272ab0f87107f0ce762bcfbe4b +EBUILD firewalld-0.3.10.ebuild 2628 SHA256 33414d752c03253a1156d17390ae894b0e2b51f41fd85a3d282f2a6d35ca9206 SHA512 b35647a489e705e548b0df8edd438d696cc68c22928ebd30ae54d2fb89619e5af18a8b6ac48ead14127af5becccdfa882db738f6c8dcd7ccc19cb656bfef9424 WHIRLPOOL b4c23471984099a01271ce037e6ec6fa4968fcebf6f02239e20cb33201b08290463bcc0c7b0868933c2adb82cbf3121eac7b511a07102795a222582fa3e41a4c +MISC ChangeLog 2647 SHA256 7582aa2d161cf82e7ff3d70e164db2103aa07e33463744d2c172af9d9d530453 SHA512 051cdb39760bdda108ab9f706539600a04efa1160e43ef2af03b3cfc46ab03bd62edfe47607d91cbebc5e37439008e42040d11af4a5dcbf5b7c9fbc651aa4905 WHIRLPOOL d22b263810c23e899e3d3def1379759f65b7bf571c21b38910e63d3d458721dc4e8551df53debfef244fa6a3593b7d959c25b462c0dc385000e721954de8aefa MISC metadata.xml 357 SHA256 ebd525995b6a8776c10d984533962fefe49a9d2e7e04ded9cc5b3efe664a58a8 SHA512 3bbc1d68b2999faf4c3a6acaf45f78621a7b612c7c691e5fdfbd7a92793be7629d67c7abf04b455c7cbef5bb0ab53214dfa15006a15df7fa40adca6689995c35 WHIRLPOOL 15b22a034a9186a4656431d20a4b64cb338ec865900fabf613e17da4c17f8e417fdf3223faaf6a9560c071b796c719157e84a8030bcf7365601f671b794461d2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVJXCHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOx90QAIFe5bAhIMyD8fOex2aNVevl -cNdQ1vuhvCY0r2VKd3c/PhCUJecHTJVxqNvk0dtbKrUW98vTuvkkyUmuTy63/SR/ -ojXozKpsc1IoRoXx9aHjAlTKMBEC9Pt0kZFPDh3aPCuekEEMoGNQrUkr4KQ829iC -8IUYWzeax/bw2tgo7oXuY3mEA0lFS6z8LAoEvLwP2JwUPfNphprCEATjbSasTyu1 -Uv1ZZVWGmTJzi4SWl4F8OX9SZUUgQ4xzBUTP9V15CqbAdOokX9KZyA03uv4WTnZs -CG6JwwyJ4DigH/A4OLoVF5uRiIGxRtQw94ZZcghYICIiyrihX6H9nQs2svjI9A3C -r+SnsYYZmKLZz1v6tPa9TlrKrptyfbW7/tbu9rxe2DVLxuet0sZUtYsy/eN+Ydvf -mRBABso8hnqr9NOx5/0EQsxdJWjCOhZQRr2mnH2FxTKu7HMlBjF7HE4KFiudBTb+ -rxgmOyZmCc+Fi74Zu1hnd8fH16c+fc2EDKgPUzBUy1B9hcnfvZrfDuW5LfkcvtKF -9w/GEcI4H1jCnqLX0NtrsJvyel0VE0Z9FtL9O0Jz01dnhrlBSL4Ej3QKtPmqmBZF -Nn12D+AEKkejRoRBaMjyVrjvXI5xOJzDQrMsILbD5QV+XBGDVYAuiXEta9x9r76o -/MxmuM+7aLg7p0SKVq/V -=3CBt +iEYEAREIAAYFAlUrYvEACgkQso7CE7gHKw0jRwCgmud0gAPGdmTgs0vVQRwl/36s +Ad4An1IdCVjAeJGGJo8P8NckJLn8KPFX +=TgCn -----END PGP SIGNATURE----- diff --git a/net-firewall/firewalld/firewalld-0.3.10.ebuild b/net-firewall/firewalld/firewalld-0.3.10.ebuild index 8fd61583cfd7..4aa99438c19b 100644 --- a/net-firewall/firewalld/firewalld-0.3.10.ebuild +++ b/net-firewall/firewalld/firewalld-0.3.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.10.ebuild,v 1.1 2014/06/17 12:50:57 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.10.ebuild,v 1.2 2015/04/13 06:32:01 idella4 Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) #BACKPORTS=190680ba inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1 @@ -43,7 +43,7 @@ src_prepare() { } src_configure() { - python_export_best + python_setup econf \ --enable-systemd \ @@ -53,31 +53,31 @@ src_configure() { src_install() { # manually split up the installation to avoid "file already exists" errors - emake -C config DESTDIR="${ED}" install - emake -C po DESTDIR="${ED}" install - emake -C shell-completion DESTDIR="${ED}" install + emake -C config DESTDIR="${D}" install + emake -C po DESTDIR="${D}" install + emake -C shell-completion DESTDIR="${D}" install install_python() { - emake -C src DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install + emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install python_optimize } python_foreach_impl install_python - python_replicate_script "${ED}"/usr/bin/firewall-{offline-cmd,cmd,applet,config} - python_replicate_script "${ED}/usr/sbin/firewalld" + python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config} + python_replicate_script "${D}/usr/sbin/firewalld" # Get rid of junk - rm -f "${ED}/etc/rc.d/init.d/firewalld" - rm -f "${ED}/etc/sysconfig/firewalld" - rm -rf "${ED}/etc/rc.d/" - rm -rf "${ED}/etc/sysconfig/" + rm -f "${D}/etc/rc.d/init.d/firewalld" + rm -f "${D}/etc/sysconfig/firewalld" + rm -rf "${D}/etc/rc.d/" + rm -rf "${D}/etc/sysconfig/" # For non-gui installs we need to remove GUI bits if ! use gui; then - rm -f "${ED}/usr/bin/firewall-applet" - rm -f "${ED}/usr/bin/firewall-config" - rm -rf "${ED}/usr/share/icons" - rm -rf "${ED}/usr/share/applications" + rm -f "${D}/usr/bin/firewall-applet" + rm -f "${D}/usr/bin/firewall-config" + rm -rf "${D}/usr/share/icons" + rm -rf "${D}/usr/share/applications" fi newinitd "${FILESDIR}"/firewalld.init firewalld -- 2.26.2