gentoo resync : 03.11.2019

3 files changed, 39 insertions, 85 deletions

diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest
index 7c041377cbae..2fd72d484486 100644
--- a/app-i18n/libtabe/Manifest
+++ b/app-i18n/libtabe/Manifest
@@ -1,8 +1,6 @@
 AUX libtabe-0.2.6-fabs.patch 1024 BLAKE2B 4b96a84c5f05323586e7a81112ebbaae7ec4cd0e6e91c9f1886d98450c7c9ca15d2b432bbeb97e7ae0af5024264f07843e6ef98cfa83763d80780645d8038444 SHA512 05d2962925ac19bd0f56078cb7fcb2808d31f80db7738bfe291e349bf69395f5d795ca2d6176550eab81b914e261e127d185ee60aca63917b5742608bda6e265
 AUX libtabe-0.2.6-ldflags.patch 2026 BLAKE2B 5902556cc1e28fb7baca2c6fbd0d7315124efa81cb9ecf960a8f40147d5c76204d09e168be0fed5b16c2d3e660d82579d5ce6e90d5cb01c55a5dafb76ef48fe7 SHA512 c7aebc251a287d0026f8b78649b30e7551e925ae936033d7af365c74416db6e350dc026f1550d3c84feb50916be661b14060b41534642531ac7871a1a0e5f233
-DIST libtabe_0.2.6-1.1.diff.gz 74149 BLAKE2B cbd5ba77d41ef147a339c6456bf42fb16b31a6928ab858338b52960ec3c8a4aa24af194d9c2eb92f64738af4f3289b889efb76ce792225823dc3d8e8f4ce8837 SHA512 001a08d69d93f0092c8a54c11a88afab850de1383febeda68c1a6b2a2b1447d01c929de47c7d947e390706d0bec6b8825b8fe11fc6c8a40d6d047b644009b6e2
 DIST libtabe_0.2.6-1.2.diff.gz 74362 BLAKE2B d09e91bad9e9e3240cdc261140012977f318436af420564692152a8b7a99cd7c427433a6180c1f9490995b43cd95200318ffb5dab68fc18561d7ced58fd00bd6 SHA512 011a76f3c8a1c13a6cfd0e96eb41557a8bfbf1aca8cb79daee0f0941b920d25614df5e0479368bf7075cb511851cab4c9113b30656d55b4d29128eb7312d0ef1
 DIST libtabe_0.2.6.orig.tar.gz 1792199 BLAKE2B fec2259678a57b144eccf49ba459d2930f89f871873b3547040fd570a0f8510bc84e27609b1ca2d82596d5a025f0bd7251870655f4a83758be806f75db5abb48 SHA512 88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7
-EBUILD libtabe-0.2.6.1.2.ebuild 1438 BLAKE2B 35ea812b928286aafb537e27764564a749de41ea0d967cdcd7bdaac503575f66cb6f7287241946ad49f0799540352eb09f0926c501e57d12034e9be103e75cf5 SHA512 418ef8f4f12a20d588e18fbb224804cc20b0d0ca1dc368d0a0d37b8566b9055f05381849df31ee19f79073953a00c11f14d9d2720b3d8e233f3f3ee2b8be32b6
-EBUILD libtabe-0.2.6.ebuild 1097 BLAKE2B beba2fc5ac62c9ecd35974d0fddb4a566570b4717569a053c2d6a797dbeb05b977593045805d6f527a3383d81630881d5ba6d807960ed948fe342b77372d5be8 SHA512 69192cbe9f460f991fd483a5ab62edca21ccf2a047165b47bbf68950b715840160135fd4551c77fbd1759eb484dcfb5550238b109d4351096fe49afad17f85ce
+EBUILD libtabe-0.2.6.1.2.ebuild 1423 BLAKE2B 71ce66ddfa62b7dfe81a88d8313241d5378266f071439a2e5a148fb6488239b949fe33f10d1daa3dcec633df887a86f360986415a757ab458a4a49cb6d089516 SHA512 b8aebd49e8cc1863e603c23253c47bf0df62cc257b96188a5782e6e060cf524b735698b5fc5a13480b4fa3c945bc3004db0277819cb92fb4638cb45973c043f0
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
index 3f33549ccf4b..62e347d8caf9 100644
--- a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
+++ b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
@@ -1,62 +1,71 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 WANT_AUTOMAKE=1.11
 
-inherit eutils libtool autotools multilib versionator
+inherit autotools
 
-DEBIAN_PV=$(replace_version_separator 3 '-')
+DEBIAN_PV=$(ver_rs 3 '-')
 DEBIAN_PATCH=${PN}_${DEBIAN_PV}.diff
 ORIG_PV=${DEBIAN_PV%-*}
 ORIG_P=${PN}-${ORIG_PV}
 
 DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
 HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:4}/libtabe/${DEBIAN_PATCH}.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/db-4.5
+RDEPEND=">=sys-libs/db-4.5:="
+DEPEND="
+	${RDEPEND}
 	x11-libs/libX11"
 
 S=${WORKDIR}/${ORIG_P}.orig
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${DEBIAN_PATCH}
-	epatch "${FILESDIR}"/${ORIG_P}-fabs.patch
-	epatch "${FILESDIR}"/${ORIG_P}-ldflags.patch
+PATCHES=(
+	"${WORKDIR}"/${DEBIAN_PATCH}
+	"${FILESDIR}"/${ORIG_P}-fabs.patch
+	"${FILESDIR}"/${ORIG_P}-ldflags.patch
+)
 
-	ln -s script/configure.in . || die
+src_prepare() {
+	default
+
+	ln -s script/configure.in configure.ac || die
 	eautoreconf
 }
 
-src_compile() {
-	myconf="--with-db-inc=/usr/include
-		--with-db-lib=/usr/$(get_libdir)
-		--with-db-bin=/usr/bin
-		--with-db-name=db
-		--enable-shared
-		--disable-static
-		$(use_enable debug)"
-
-	econf ${myconf}
+src_configure() {
+	econf \
+		--with-db-inc="${EPREFIX}"/usr/include \
+		--with-db-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-db-bin="${EPREFIX}"/usr/bin \
+		--with-db-name=db \
+		--enable-shared \
+		--disable-static \
+		$(use_enable debug)
+}
 
+src_compile() {
 	# We execute this serially because the Makefiles don't handle
 	# proper cross-directory references.
-	for dir in src util tsi-src; do
-		emake -C ${dir} || die "make failed"
-	done
+	emake -C src
+	emake -C util
+	emake -C tsi-src
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc doc/* || die
+	default
+	dodoc -r doc/.
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/libtabe/libtabe-0.2.6.ebuild b/app-i18n/libtabe/libtabe-0.2.6.ebuild
deleted file mode 100644
index 21639e688efb..000000000000
--- a/app-i18n/libtabe/libtabe-0.2.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils libtool autotools multilib
-
-DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
-HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
-SRC_URI="mirror://debian/pool/main/libt/libtabe/${P/-/_}.orig.tar.gz
-	mirror://debian/pool/main/libt/libtabe/${P/-/_}-1.1.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug"
-
-DEPEND=">=sys-libs/db-4.5
-	x11-libs/libX11"
-
-S=${WORKDIR}/${P}.orig
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P/-/_}-1.1.diff
-	epatch "${FILESDIR}"/${P}-fabs.patch
-	rm -f configure
-	elibtoolize
-	cd script
-	eautoreconf
-	cp script/* ./
-	cp configure ../
-	cd ..
-}
-
-src_compile() {
-	myconf="--with-db-inc=/usr/include
-		--with-db-lib=/usr/$(get_libdir)
-		--with-db-bin=/usr/bin
-		--with-db-name=db
-		--enable-shared
-		--disable-static
-		$(use_enable debug)"
-
-	econf ${myconf}
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc doc/*
-}