From 823dc4961771904cabf8e283fe0e55ac134fd124 Mon Sep 17 00:00:00 2001 From: blshkv Date: Mon, 3 Jun 2019 21:23:41 +0800 Subject: [PATCH] profile: BSD-3 -> BSD license migration --- .../deathstar/deathstar-20180623.ebuild | 2 +- app-exploits/empire/empire-2.5.ebuild | 2 +- dev-go/fetchbot/fetchbot-1.1.2.ebuild | 2 +- dev-go/goquery/goquery-1.4.1.ebuild | 2 +- dev-go/mux/Manifest | 1 - dev-go/mux/mux-1.6.1.ebuild | 21 ------------- dev-go/mux/mux-1.6.2.ebuild | 2 +- .../robotstxt-go/robotstxt-go-20170603.ebuild | 2 +- dev-go/uuid/Manifest | 2 -- dev-go/uuid/uuid-0.2.ebuild | 28 ----------------- dev-go/uuid/uuid-1.0.0.ebuild | 28 ----------------- dev-go/uuid/uuid-1.1.0.ebuild | 2 +- .../googlesearch-20181112-r1.ebuild | 2 +- dev-python/splinter/splinter-0.10.0.ebuild | 2 +- dev-python/vulndb/Manifest | 1 - dev-python/vulndb/vulndb-0.1.0.ebuild | 25 ---------------- dev-python/vulndb/vulndb-0.1.1.ebuild | 2 +- dev-ruby/rex/Manifest | 1 - dev-ruby/rex/rex-2.0.12.ebuild | 30 ------------------- dev-ruby/rex/rex-2.0.13.ebuild | 2 +- licenses/BSD-3 | 28 ----------------- 21 files changed, 11 insertions(+), 176 deletions(-) delete mode 100644 dev-go/mux/mux-1.6.1.ebuild delete mode 100644 dev-go/uuid/uuid-0.2.ebuild delete mode 100644 dev-go/uuid/uuid-1.0.0.ebuild delete mode 100644 dev-python/vulndb/vulndb-0.1.0.ebuild delete mode 100644 dev-ruby/rex/rex-2.0.12.ebuild delete mode 100644 licenses/BSD-3 diff --git a/app-exploits/deathstar/deathstar-20180623.ebuild b/app-exploits/deathstar/deathstar-20180623.ebuild index 16ef77ff7..fe6422526 100644 --- a/app-exploits/deathstar/deathstar-20180623.ebuild +++ b/app-exploits/deathstar/deathstar-20180623.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/byt3bl33d3r/DeathStar" SRC_URI="https://github.com/byt3bl33d3r/DeathStar/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/app-exploits/empire/empire-2.5.ebuild b/app-exploits/empire/empire-2.5.ebuild index 437c0cbe4..3bee94775 100644 --- a/app-exploits/empire/empire-2.5.ebuild +++ b/app-exploits/empire/empire-2.5.ebuild @@ -21,7 +21,7 @@ fi DESCRIPTION="A post-exploitation framework with Windows/Linux agents" HOMEPAGE="https://github.com/EmpireProject/Empire" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="powershell java" diff --git a/dev-go/fetchbot/fetchbot-1.1.2.ebuild b/dev-go/fetchbot/fetchbot-1.1.2.ebuild index e41d8604d..8c41c0aa3 100644 --- a/dev-go/fetchbot/fetchbot-1.1.2.ebuild +++ b/dev-go/fetchbot/fetchbot-1.1.2.ebuild @@ -17,7 +17,7 @@ inherit golang-build DESCRIPTION="A simple and flexible web crawler that follows the robots.txt policies and crawl delays" HOMEPAGE="https://github.com/PuerkitoBio/fetchbot" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" IUSE="" diff --git a/dev-go/goquery/goquery-1.4.1.ebuild b/dev-go/goquery/goquery-1.4.1.ebuild index 3a869dab7..5125a51cf 100644 --- a/dev-go/goquery/goquery-1.4.1.ebuild +++ b/dev-go/goquery/goquery-1.4.1.ebuild @@ -17,7 +17,7 @@ inherit golang-build DESCRIPTION="A little like that j-thing" HOMEPAGE="https://github.com/PuerkitoBio/goquery" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" IUSE="" diff --git a/dev-go/mux/Manifest b/dev-go/mux/Manifest index 3cacd0fca..d774a9aaa 100644 --- a/dev-go/mux/Manifest +++ b/dev-go/mux/Manifest @@ -1,2 +1 @@ -DIST mux-1.6.1.tar.gz 36402 BLAKE2B 4aff091bbddfba18681c97d280e140dbce9a42961f512ba982d7723a2a42765b797c73018b4f0d2e7de62defc0d94af7e6f92d518446a2b34eac9087249497e2 SHA512 c0dce766ead081f69c78106fec3efb4e0d3ebcbf43782f6a0b5f7799ab5545a2935307a79f81809f447105925fe4a0146e23772850a2aa736c50e5059d47b03f DIST mux-1.6.2.tar.gz 38074 BLAKE2B 904f8737049868f3ac1ab7e91af21d438738179a649bd210dcd7f59fb58f6b6fd3b9bef8b34548af5ba3d45eff08cd33492f4501aa96c7bfebc8b793bb9eb17f SHA512 f4ea99c13839181f891b5bd47e060c0fde21219cee3550d65884f6f1ce7a7310b55f97c3da1e4a769412ca21f1d0d2d02e5427c63580c407091b963236cd82d1 diff --git a/dev-go/mux/mux-1.6.1.ebuild b/dev-go/mux/mux-1.6.1.ebuild deleted file mode 100644 index 66f1d1c78..000000000 --- a/dev-go/mux/mux-1.6.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/gorilla/${PN} - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - EGIT_COMMIT="v${PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -DESCRIPTION="A powerful URL router and dispatcher for golang" -HOMEPAGE="https://github.com/gorilla/mux" -LICENSE="BSD-3" -SLOT="0" -IUSE="" diff --git a/dev-go/mux/mux-1.6.2.ebuild b/dev-go/mux/mux-1.6.2.ebuild index 66f1d1c78..4c926e5e0 100644 --- a/dev-go/mux/mux-1.6.2.ebuild +++ b/dev-go/mux/mux-1.6.2.ebuild @@ -16,6 +16,6 @@ inherit golang-build DESCRIPTION="A powerful URL router and dispatcher for golang" HOMEPAGE="https://github.com/gorilla/mux" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" IUSE="" diff --git a/dev-go/robotstxt-go/robotstxt-go-20170603.ebuild b/dev-go/robotstxt-go/robotstxt-go-20170603.ebuild index 945f7dd44..98d1fec6b 100644 --- a/dev-go/robotstxt-go/robotstxt-go-20170603.ebuild +++ b/dev-go/robotstxt-go/robotstxt-go-20170603.ebuild @@ -17,6 +17,6 @@ inherit golang-build DESCRIPTION="The robots.txt exclusion protocol implementation" HOMEPAGE="https://github.com/temoto/robotstxt" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" IUSE="" diff --git a/dev-go/uuid/Manifest b/dev-go/uuid/Manifest index 529556293..2587a4fd2 100644 --- a/dev-go/uuid/Manifest +++ b/dev-go/uuid/Manifest @@ -1,3 +1 @@ -DIST uuid-0.2.tar.gz 12729 BLAKE2B fa012a28fa7985db3d640ac5b238e517cafbb7a65223e16b359a88ffd0d7cf23868b528acc4b54b6bb24aa52e0768a4da54de9037fc033047648e9d3f5ceb274 SHA512 358f2d813583a376ecad5e19b7a53543cdb91942ad5b1f8688e4da303dac24bd95f37f9b14de401241bf6e15fb5011358d2bbb47c44d0bd5fcf9ab8a82cf4120 -DIST uuid-1.0.0.tar.gz 13129 BLAKE2B 6ecba48c5cca7568f513740446f36e32fa445033b3c91c4c75f4fca22703020934a6176d1b8f1459c92f2d88984a550107b797d8cb812f2664a0416cc3a1f8a4 SHA512 f91d11c8514a85201b152be33229d60146886611b7f8cd42a249b2a1d590489cdc6a9037f482342ad8a8386d3e5cf38ad2c2c10a046f03a1e38f463aafb73f95 DIST uuid-1.1.0.tar.gz 13546 BLAKE2B 10144ee26970c0715b260b4fdf890aee04939a06d781265002c49bd0981788505f6f2e86cfd2e6356e3c607b51d0a0bce9bbc8e526197c94dd1ca2a6b70482d1 SHA512 820cf7a35398a3c3238c2dc3e4f21a0019efb26c34fe1ee066c150ce6b1799e826344e1270382db103f326b6fd33f02d5d54065855f4d1723aa3a56ef602af74 diff --git a/dev-go/uuid/uuid-0.2.ebuild b/dev-go/uuid/uuid-0.2.ebuild deleted file mode 100644 index b90920249..000000000 --- a/dev-go/uuid/uuid-0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN=github.com/google/uuid - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64 ~x86 ~arm ~arm64" - EGIT_COMMIT="${PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi - -inherit golang-build - -DESCRIPTION="A UUID package for Go." -HOMEPAGE="https://github.com/google/uuid" - -LICENSE="BSD-3-Clause" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/go-1.10" -DEPEND="${RDEPEND}" diff --git a/dev-go/uuid/uuid-1.0.0.ebuild b/dev-go/uuid/uuid-1.0.0.ebuild deleted file mode 100644 index b90920249..000000000 --- a/dev-go/uuid/uuid-1.0.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN=github.com/google/uuid - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64 ~x86 ~arm ~arm64" - EGIT_COMMIT="${PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi - -inherit golang-build - -DESCRIPTION="A UUID package for Go." -HOMEPAGE="https://github.com/google/uuid" - -LICENSE="BSD-3-Clause" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/go-1.10" -DEPEND="${RDEPEND}" diff --git a/dev-go/uuid/uuid-1.1.0.ebuild b/dev-go/uuid/uuid-1.1.0.ebuild index 83c9a5cb6..babb28036 100644 --- a/dev-go/uuid/uuid-1.1.0.ebuild +++ b/dev-go/uuid/uuid-1.1.0.ebuild @@ -19,7 +19,7 @@ inherit golang-build DESCRIPTION="A UUID package for Go." HOMEPAGE="https://github.com/google/uuid" -LICENSE="BSD-3-Clause" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/dev-python/googlesearch/googlesearch-20181112-r1.ebuild b/dev-python/googlesearch/googlesearch-20181112-r1.ebuild index 14a489133..9832ea24b 100644 --- a/dev-python/googlesearch/googlesearch-20181112-r1.ebuild +++ b/dev-python/googlesearch/googlesearch-20181112-r1.ebuild @@ -22,7 +22,7 @@ DESCRIPTION="Google search from Python" HOMEPAGE="https://github.com/MarioVilas/googlesearch" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" IUSE="" diff --git a/dev-python/splinter/splinter-0.10.0.ebuild b/dev-python/splinter/splinter-0.10.0.ebuild index 3b62fee10..886090914 100644 --- a/dev-python/splinter/splinter-0.10.0.ebuild +++ b/dev-python/splinter/splinter-0.10.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/cobrateam/splinter" SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" #SRC_URI="https://github.com/cobrateam/python-htmlentities/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/dev-python/vulndb/Manifest b/dev-python/vulndb/Manifest index 95d66fb71..9fdcdd28b 100644 --- a/dev-python/vulndb/Manifest +++ b/dev-python/vulndb/Manifest @@ -1,2 +1 @@ -DIST vulndb-0.1.0.tar.gz 50871 BLAKE2B bf21f02084cd7493bafce67c0e6d6aa72c9c475ae3d5ab85b01af62c157cb39e69d639a7d59743bd2a4cf2466eb96588345fc9e2f3844b433264da0ccc8dac03 SHA512 e4e8e7a2e8c0ba803d17005c50e9c30a10f1bf459aabe621760baa103f0b8e4ee2dff91c54eef5c4ddd1aebd2ddbc68e81fe6de0dfa37ed11d4d18e2a112cba9 DIST vulndb-0.1.1.tar.gz 51081 BLAKE2B ed00f060ab6fda7b60de17c34ce98cda8a85cb456e1a894e959a618cd54bf0e34820af5a5d79b83e41932a8ffec5d49ffb195175a77f0f0234020632b61fd15a SHA512 58509f0ed3e413513f85e936388fcfb269143e7eb60e01302b25e8c3e259731a58f2d64bda94506ba6d1f3bdadf72e5feba67fa293137ecec3f0cb156b4ef4a2 diff --git a/dev-python/vulndb/vulndb-0.1.0.ebuild b/dev-python/vulndb/vulndb-0.1.0.ebuild deleted file mode 100644 index 6ed52fd84..000000000 --- a/dev-python/vulndb/vulndb-0.1.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Python SDK to access the vulnerability database" -HOMEPAGE="https://github.com/vulndb/python-sdk/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -src_prepare(){ - sed -e 's|setuptools_git >= 1.1||' -i setup.py || die "sed failed" - eapply_user -} diff --git a/dev-python/vulndb/vulndb-0.1.1.ebuild b/dev-python/vulndb/vulndb-0.1.1.ebuild index 6ed52fd84..0581c489a 100644 --- a/dev-python/vulndb/vulndb-0.1.1.ebuild +++ b/dev-python/vulndb/vulndb-0.1.1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Python SDK to access the vulnerability database" HOMEPAGE="https://github.com/vulndb/python-sdk/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -LICENSE="BSD-3" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/dev-ruby/rex/Manifest b/dev-ruby/rex/Manifest index de9b8ed3b..7d184260f 100644 --- a/dev-ruby/rex/Manifest +++ b/dev-ruby/rex/Manifest @@ -1,2 +1 @@ -DIST rex-2.0.12.gem 1393152 BLAKE2B 00b568af8e10e55d4d24a8261af30716477480224f31687be389345d828f92e64789dc2b698d7a9de7749f41adeed3ee9d27d46f7793f82e8bed94fbdecbf714 SHA512 18e82858c77f2271cbf9491aacf0051ed55424ec56ba412a3ebe74c402ee050b3b9b90285b57945de2b38ead679ade3dd438337289b48b76a7f3eb5a4ba6897a DIST rex-2.0.13.gem 1393664 BLAKE2B 062da0ac0fae64a1671a2380aa531ac5b9d33ff49e3f1e23028a67e1021044b03be3a8cc25cadee5aa0ef3dbc6e4454fcdb10f6b500c5aeebf5f620eedd34420 SHA512 b18428c718b7d8174d98bda1405de36ba3f14f4164d57d912b3f72af1cb3e19bb37178d96e899dc017065ae5558a169b0ce9c86219cf75d24c02f9f9364d5463 diff --git a/dev-ruby/rex/rex-2.0.12.ebuild b/dev-ruby/rex/rex-2.0.12.ebuild deleted file mode 100644 index b32c30ccb..000000000 --- a/dev-ruby/rex/rex-2.0.12.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_RUBY="ruby23 ruby24" -#RUBY_FAKEGEM_RECIPE_TEST="rspec3" -#RUBY_FAKEGEM_TASK_DOC="" -#RUBY_FAKEGEM_BINWRAP="" - -inherit ruby-fakegem - -DESCRIPTION="A variety of classes useful for security testing and exploit development" -HOMEPAGE="https://github.com/rapid7/rex/" - -LICENSE="BSD-3-CLAUSE" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -# doesn't seem to actually run any tests, fails without disabling -RESTRICT=test - -ruby_add_bdepend "dev-ruby/filesize - dev-ruby/jsobfu - dev-ruby/json:2 - =dev-ruby/metasm-1* - =dev-ruby/nokogiri-1* - dev-ruby/rb-readline" diff --git a/dev-ruby/rex/rex-2.0.13.ebuild b/dev-ruby/rex/rex-2.0.13.ebuild index b19ebd362..ab1da8d44 100644 --- a/dev-ruby/rex/rex-2.0.13.ebuild +++ b/dev-ruby/rex/rex-2.0.13.ebuild @@ -13,7 +13,7 @@ inherit ruby-fakegem DESCRIPTION="A variety of classes useful for security testing and exploit development" HOMEPAGE="https://github.com/rapid7/rex/" -LICENSE="BSD-3-CLAUSE" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" diff --git a/licenses/BSD-3 b/licenses/BSD-3 deleted file mode 100644 index e196e700d..000000000 --- a/licenses/BSD-3 +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2013-2016, Joshua Pitts -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.