[gentoo-commits] repo/gentoo:master commit in: net-libs/adns/

[gentoo-commits] repo/gentoo:master commit in: net-libs/adns/

[Ulrich Müller]

commit:     d6818df54ccfe0519b9e529e2a600f1fd64b575e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 12:33:35 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:34:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6818df5

net-libs/adns: [QA] Fix LICENSE.

GNU adns itself is distributed under GPL-2+, only the adns.h header
file is under LGPL-2+.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/adns/adns-1.4-r2.ebuild | 2 +-
 net-libs/adns/adns-1.4.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/adns/adns-1.4-r2.ebuild b/net-libs/adns/adns-1.4-r2.ebuild
index 6e0e060ea03..4378c5a1d2e 100644
--- a/net-libs/adns/adns-1.4-r2.ebuild
+++ b/net-libs/adns/adns-1.4-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and
 HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
 SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 

diff --git a/net-libs/adns/adns-1.4.ebuild b/net-libs/adns/adns-1.4.ebuild
index 92258217447..6fcb3731572 100644
--- a/net-libs/adns/adns-1.4.ebuild
+++ b/net-libs/adns/adns-1.4.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and
 HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
 SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: net-libs/adns/

[Ulrich Müller]

commit:     232425b676eb0721876b373bd711ca48a1478e73
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 13:29:17 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 13:30:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232425b6

net-libs/adns: [QA] Missing die statement.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/adns/adns-1.4-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/adns/adns-1.4-r2.ebuild b/net-libs/adns/adns-1.4-r2.ebuild
index 4378c5a1d2e..36e6d678aa2 100644
--- a/net-libs/adns/adns-1.4-r2.ebuild
+++ b/net-libs/adns/adns-1.4-r2.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-cnamechain.patch
-	#remove bogus test wrt bug #295072
-	rm "${S}"/regress/case-cnametocname.sys
+	# remove bogus test wrt bug #295072
+	rm "${S}"/regress/case-cnametocname.sys || die
 	eapply_user
 }