gentoo resync : 25.08.2020

3 files changed, 5 insertions, 61 deletions

diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index e52a4769d72a..039378d0128b 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,6 +1,4 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
-DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.2.6-r1.ebuild 1048 BLAKE2B 7374d90655b70a6568a89e63c641ca454f10f8663ea1a7070bcfb61e7ada6e3eb3d1bcbc21c38a1fdf9e017d21f3aa81fd4f1fcaf4eb8e19601b12db723009de SHA512 88c8505ef9ee11f5df3ffb59fc9b19ca4d86e6e6c18de1339c5f2dc82382a7b7bca866948bba624430c8db7dac6330a03d491e23408857ec57576f202957fcce
-EBUILD libnatspec-0.3.0.ebuild 1063 BLAKE2B 3ba0e5b3f679b02ecf61cbed46ba0a3653cba9a321d66acaefa6ea5ea88a0ea9df9b90d6ee2890c5c9b69ec15b0209aaecb72d5fbcd5ee7e483e224822de9fd2 SHA512 26bd63ed4e76c24d5a302cad94ce157e1b0cf96f5156aada6df38f076d8300510bad701b35dda950fb02530bedf5b0145174af4f7404145b03b85e90d3344880
+EBUILD libnatspec-0.3.0.ebuild 810 BLAKE2B 9ace7528a660f8928bfdcb659d6b5009f32997122965fa787ae6c524226af5bbb771c19b76287e451856bdcc55507969b2d15e35d3e010978d47853f16b105c3 SHA512 3f3ed3adb6353cdf3434298d82c24a6c6f0a44b84b09afa90f94b2ffeddf927ccb57faa7b378ebdf1c95e1ba1309bc8371e7787dcfab582325a8d06e8fb6b694
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
deleted file mode 100644
index 3f61a7d4e60b..000000000000
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="library to smooth charset/localization issues"
-HOMEPAGE="http://natspec.sourceforge.net/"
-SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/popt
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/tcl:0= )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-iconv.patch
-	# regenerate to fix imcompatible readlink usage
-	rm -f "${S}"/ltmain.sh "${S}"/libtool || die
-	eautoreconf
-}
-
-src_configure() {
-	use doc || export ac_cv_prog_DOX=no
-	# braindead configure script does not disable python on --without-python
-	econf $(use python && use_with python)
-}
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 750d3276c9d9..90bb1fab67c6 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
+inherit autotools
 
 DESCRIPTION="library to smooth charset/localization issues"
 HOMEPAGE="http://natspec.sourceforge.net/"
@@ -14,26 +12,18 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="doc"
 
 RDEPEND="
 	dev-libs/popt
-	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/tcl:0= )"
+	doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.6-iconv.patch
 )
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	# regenerate to fix imcompatible readlink usage
@@ -44,5 +34,5 @@ src_prepare() {
 src_configure() {
 	use doc || export ac_cv_prog_DOX=no
 	# braindead configure script does not disable python on --without-python
-	econf $(use python && use_with python)
+	econf
 }