projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f776d0d)
Adopt to recent aggreemant about how to handle bindist, #541450
authorJustin Lecher <jlec@gentoo.org>
Fri, 6 Mar 2015 15:38:46 +0000 (15:38 +0000)
committerJustin Lecher <jlec@gentoo.org>
Fri, 6 Mar 2015 15:38:46 +0000 (15:38 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

net-misc/vpnc/ChangeLog patch | blob | history
net-misc/vpnc/Manifest patch | blob | history
net-misc/vpnc/metadata.xml patch | blob | history
net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild patch | blob | history
net-misc/vpnc/vpnc-0.5.3_p550.ebuild patch | blob | history

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index f18ef7a811171c4c77af7a2e351087df721311e6..56af735eba9cddb5e6f82cd36ba2537aef9dd8d7 100644 (file)
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.133 2015/02/27 08:05:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.134 2015/03/06 15:38:45 jlec Exp $
+
+  06 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  vpnc-0.5.3_p527-r1.ebuild, vpnc-0.5.3_p550.ebuild:
+  Adopt to recent aggreemant about how to handle bindist, #541450
 
 *vpnc-0.5.3_p550 (27 Feb 2015)
 
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 5ae85431609ce47159c3a18dadd32bd7d2929305..fc8d5a2465febc42ed51f67fd50602445a384049 100644 (file)
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -9,26 +9,26 @@ AUX vpnc.confd 123 SHA256 89a14f4d11b7fb156dd823e5d2c15edd0d5ca649bd16460ef6350c
 AUX vpnc.service 517 SHA256 51ee186919591f490a92aa16524317f775d7b0b0a794e58ff75f0f58f5179421 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5 WHIRLPOOL ba3c121e1bdc77c9d05f7bd6c56c6dc866e12b95ce90841ffd26d419d0759a15e2fc4855585d30b8fff8edc541cea9b52897bef3e1007ebe8a9c80d63a5eccff
 DIST vpnc-0.5.3_p527.tar.xz 98740 SHA256 4076e40b3be37ba95c393cc5e21cccf87540e994275bd336a4ec0c6b4c3d54de SHA512 6c657039c4f914b03214912ef3471fae755b4dcbf771c3653ed00d90bb044fa83dbca7a5cda9ac0c9389baae96c658566c8b3f3a4b94c078dda8387935532c9f WHIRLPOOL 61aaf00f63e531eebf3583492f288ee339c446b0a273f1ff5c008dc37ab9f74749ee3c74ea0f110018ef764448c838064de6140743941ff17039e4288cfe66e8
 DIST vpnc-0.5.3_p550.tar.xz 101860 SHA256 5d7582eb3d7ead3cb0732a404ce10f471a65c48d0bb4cb2dd5c525273bf0f4b5 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55 WHIRLPOOL 8194e0dcf2c0bd1910b4b110dd475024d5cc351d86dec58b33811c37f9bcbc2702c4fede861a6318c54dfb7d19ff2d2265da86d573181a02f433e131184b9bd3
-EBUILD vpnc-0.5.3_p527-r1.ebuild 2430 SHA256 138db0d630c81b595bbaf856e56ae2063be4530dfe8e4eaa3e3938addb19d812 SHA512 20b9af41dfa786a76d69403fff5e7d3ec84ca0ee8df3073e57c0b99f1db6f965e62bb66358cb7e92fed33cd0d672127468b3c8c80f7ee3984e64232105833d51 WHIRLPOOL ffa1675441c62c506e4c7c852564b3ff29991a9ea1e99be252a025315fe359fc7a6f62a4d34a7175fad2f1f8db5e231d55398aa4bd3e6eb7ae7a5a26d77a9b43
-EBUILD vpnc-0.5.3_p550.ebuild 2377 SHA256 9c7852f2a1ada2c0067b9ded6a2897437a24b92df3eb1b491a486e728d6acc6d SHA512 5b37d0a6e75373325027e120535b893b0306fdc5c82599ed390674468bb2c9fdeaa58329cbe55eb68cceb96e6ea3eec28d96787021faec8979ab34a528d668ed WHIRLPOOL d1b84ba9b9bf86801b37e026f39603264052045f919401cf03aed17065b76f2363694ab4162751dc4758c309239d9a4ed92c91a6fcc861a5202789d8be8002c4
-MISC ChangeLog 20639 SHA256 5a85fd09ae7f8c617c9f9a45c3d7eadb146c07d5e990b0f22ddc5d03ff25ecb9 SHA512 7c773e67152b9b51f8b502bd1d288dc0db1985127fd27d388a24d574f26949fba2eca2e8e15b8ce4d8edc784d16e778c9d2c8b7e6637ad00dd805bd41416208a WHIRLPOOL a729f57d5edfcd13f783fe64e3bb2e8161b05adaa67bd42ae264ab46702a4cd044d29ae23d999d71895c7dec3209194b256c9b13b78f415637aee53f3412ccb2
-MISC metadata.xml 710 SHA256 f99a506f58567481f5feb63a711d32dab22bb0d3cc0d703d827a0138c925b694 SHA512 5c2249239d3a575155c412b21bfcfa5503a9578dc2840118a80e55eac7a2457fb6adc4df29de8d37ff210557ee74ae6c943f591121af62df9a356089dd87c12b WHIRLPOOL a140a705f11f3b283254d6a6a297ab694e02148d558e8994ebbf44368906455928a3df80e48df8135d8f5a31dca095c15f3f920e6d262ae65c5afdf4fe45c476
+EBUILD vpnc-0.5.3_p527-r1.ebuild 2367 SHA256 86c0f51890cad8a8acb251ef7303dc46f9b2577ec69130706c5267e101fd3fd4 SHA512 5c481c2e83c25f1689438520c31a7228a74b9cd6a53f8649ec10a622dd241f01f9a6355afc27d8a6e8b14bb757ebe3e13693118756f88867c935c96aac3e0290 WHIRLPOOL af199b7dcfa6c806123cd18414df44d7a0dfd23d8fb59ba85a5a286e728430d4b1c6b4fa1b009ae55ea243ad4c129d7681ff2838f80c53072f84a185a75fc064
+EBUILD vpnc-0.5.3_p550.ebuild 2314 SHA256 24b0e39b20fa948596082722208aa6371aca2b618a6e77691ae9e27be2e4ef4f SHA512 8fbb40443863bd9e306f4500f3c149705bd80e4e131cb324176edc9e9106726743af25b668926a416590a7ec5940f26cee91108f995d195a438c783f5ef30569 WHIRLPOOL 9d18c7832a6fa01509274571e80189aeabf83437b88c8a7d99d782f0bf3a9a157aa78b47618e546c8edf21a221b72b947a81ca1dc11a81488d6d560f2a0c4ea5
+MISC ChangeLog 20820 SHA256 3a5951a0a3ba83d6bec715716533f403de92ca291dacaebda901db9bc6892393 SHA512 4640b0baeaccdd68d08af4214e7f031fba36cdb5745b6de4988a30c1d6944809e1453913d23b70a6edb311f82e00c7adb6de4d1528f557e92b59996adde0e977 WHIRLPOOL 7f70f4dbdcca43afc83ccfd35e2315ccc3786c89a1b21fde657cba9294246512140c91e86d852c6ecbff745b717ff41694babc15a89aea3a025318036a26e4d4
+MISC metadata.xml 593 SHA256 2e8d9a6f0d3063ca5b34b0abc213de07c7a7d1309e32e6362ffa2b04c4a832e7 SHA512 c536bc517bb913ebc8b081096bcadedd3447c330e1ee291a2c781c819c52ca2951c1e768c3a10f2505ba6456603727d7875929b0eb2ef3510e0aa72fbe022179 WHIRLPOOL 2f108dbd66913340642460c864e0f72ad8c76cf4a66a7627f16ac693ef1f6208b05e9adccfdb2b25c685f8bdcca2f57e8d3d0e6cead8b84bbe841ee297975bfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU8CVnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU+coGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/wYQAIGqQ1iq10aDC0dHtWKVBhK/
-/qxxECmq2kN5sq7udZUe3kXbB7VKQNz3niS/DJXcM50d2qv0uxFZTk8qlS3L29qh
-VgaUHyJqv8OCmkQSBVdjKX92j+Ww5W77JHTThaPFNcLbs1b6WcPaetx02hjVCfXJ
-64i5m5ykpu17Wi6fSKuSszeA3FUQQDCNhd98qF5OLYoxiTxQkFLAiBSycI9vRanu
-98GOFPbgx3SabMVS1zW5IYaOAkVPkywSmmDQGwlSBuZzpLtgtSnUOwM4OnUkqRRE
-6Cv4SZZXSn0P7D7fYfSBSe7wTwr/Yxp/GadYkcxO6yulTXyUl36qXGAfPQBUcJjn
-6iwI6lZlWddhhCdL44lfrcAAHevhEPsa5Tl/RMMIGOcqbAVSOhxH3LlcAyW5VOQn
-kvZ0vzmMtTtfpLtZxynHRV4ghHIhFQ5f4K6t+EID2VyPgXcAXxdGcuJqevAw8pnN
-UP73VrKpRB7cn7x4fFmrS8s6t5wURyNlS9lpvY46RKB4Wtd/iyFSJEoID59wC0Oc
-jBYA8KiVvftT4KEgTb/V9ST0+B52lPEF8/qMq0Omtgvl5oQSldHveCB5FUIqhFLk
-xxFGQMuQTSNRsY8y5BvZRlvWb6qlRKIqSNy/KRGVGvd3CpRBal925hnCagA92q3O
-yhB0hz5gwziVgOsPL4QQ
-=cu6L
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgeMQAKSHOlBZMdozdzffwKnb0he1
+fzaNWDzRZvNdX+l/5rcA+NEjb6XyXpH5HhwwoSn4cr832l/dQfvXXsdTkg7AF/mF
+24jBsQIUkpdVQ08FEGZMCSXLwZjj9YdggwBihoRmlCbIOjBj/21UTtvtqVLEmMpS
+EnKEwfQyIry+QpSuRDCAQgrwwkgDmXH4LR5F9XuQ1DUslL7tl080gcl0wTip5uxs
+DP+GeTFwlNySe37cIoSF1HRqdVGR4crkhRPw9o+4UvfbsvTYNRPJS0tgyAZDTj4g
+Gs75D6JA6Lkzyvy8gd81cVHnndnBhwZp0SZq/ts3DKGTQkK+9Wl8OyjS4YYGCJdr
+coMeE5vRJH4yP45uoGT7E1Gnwk4JinEO/byb0c8KaJMaW6qffq/GfzxRMm38VOLR
+jul0X7Hu1QWqpMz08LoiDqjyFU3Wuw39ECZuHJa3J7zqjLzZFhgxl4QsfewqbRzO
+bxN5HNio8Zd1pspfqreN0S51ecrLDfIjVCJfC0A7xvKcRJi9BDwR3KGR/4mIcL0F
+yK4Vg1FeEI4+pPOBlID2Gk8YdXZ+spoSma9jBhGIVnu2sxJ6UWi7u5THG4BvicV1
+43ra/lRyNxnOKKJzNMVQJD1lRKlNYCCp32Y0wLdsRAwyYjOd1W/Ui4WIh8FcLc3j
+fi7ynNpbNBEHjsxvVcqV
+=gVmL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index 81e3d8128b024d04519cbbd48653a2bd355a6b8a..0baeef4b3423d737b718f05f05b066471edc1a02 100644 (file)
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -15,7 +15,6 @@
     <name>Justin Lecher</name>
   </maintainer>
   <use>
-    <flag name="bindist">Using GnuTLS for SSL support as redistribution with OpenSSL as provider violates GPL</flag>
     <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
index fb0ee71380014233e3a69508a9e8a3df8f57e100..8372001a121ea70144dc595965d0164d47f55e8a 100644 (file)
--- a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v 1.14 2015/02/27 08:05:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v 1.15 2015/03/06 15:38:45 jlec Exp $
 
 EAPI=5
 
@@ -13,34 +13,32 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="resolvconf +gnutls bindist selinux"
-
-REQUIRED_USE="bindist? ( gnutls )"
+IUSE="resolvconf +gnutls selinux"
 
 DEPEND="
        dev-lang/perl
        dev-libs/libgcrypt:0=
        >=sys-apps/iproute2-2.6.19.20061214[-minimal]
-       gnutls? ( net-libs/gnutls:= )
-       !gnutls? ( dev-libs/openssl )"
+       gnutls? ( net-libs/gnutls )
+       !gnutls? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}
        resolvconf? ( net-dns/openresolv )
        selinux? ( sec-policy/selinux-vpn )
 "
 
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!gnutls? ( bindist )"
 
 CONFIG_CHECK="~TUN"
 
 src_prepare() {
-       if ! use gnutls && ! use bindist; then
+       if use gnutls; then
+               elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+               elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+       else
                sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile     || die
                ewarn "Building SSL support with OpenSSL instead of GnuTLS.  This means that"
                ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
                ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
-       else
-               elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
-               elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
        fi
 
        epatch "${FILESDIR}"/${PN}-0.5.3_p514-as-needed.patch
diff --git a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild b/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
index 6fc2443b92f7bfcd13c03d932873627a780ecf12..246a80cffa9a832d9c2b3c92588a393e9f3eee2a 100644 (file)
--- a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v 1.1 2015/02/27 08:05:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p550.ebuild,v 1.2 2015/03/06 15:38:45 jlec Exp $
 
 EAPI=5
 
@@ -13,34 +13,32 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf +gnutls bindist selinux"
-
-REQUIRED_USE="bindist? ( gnutls )"
+IUSE="resolvconf +gnutls selinux"
 
 DEPEND="
        dev-lang/perl
        dev-libs/libgcrypt:0=
        >=sys-apps/iproute2-2.6.19.20061214[-minimal]
-       gnutls? ( net-libs/gnutls:= )
-       !gnutls? ( dev-libs/openssl )"
+       gnutls? ( net-libs/gnutls )
+       !gnutls? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}
        resolvconf? ( net-dns/openresolv )
        selinux? ( sec-policy/selinux-vpn )
 "
 
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!gnutls? ( bindist )"
 
 CONFIG_CHECK="~TUN"
 
 src_prepare() {
-       if ! use gnutls && ! use bindist; then
+       if use gnutls; then
+               elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+               elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+       else
                sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile     || die
                ewarn "Building SSL support with OpenSSL instead of GnuTLS.  This means that"
                ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
                ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
-       else
-               elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
-               elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
        fi
 
        sed -e 's:test/cert0.pem::g' -i Makefile || die
Unnamed repository; edit this file 'description' to name the repository.