public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/libtabe/
@ 2019-10-19 10:48 David Seifert
  0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2019-10-19 10:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d8c1b6629cfb17de108c09ff1e82b9b5b7264249
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 10:48:01 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 10:48:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c1b662

app-i18n/libtabe: Remove old

Bug: https://bugs.gentoo.org/697382
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-i18n/libtabe/Manifest             |  1 -
 app-i18n/libtabe/libtabe-0.2.6.ebuild | 53 -----------------------------------
 2 files changed, 54 deletions(-)

diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest
index 3dddd4a3a76..ef4285baf21 100644
--- a/app-i18n/libtabe/Manifest
+++ b/app-i18n/libtabe/Manifest
@@ -1,3 +1,2 @@
-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

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 21639e688ef..00000000000
--- 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/*
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-i18n/libtabe/
@ 2019-10-19 10:48 David Seifert
  0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2019-10-19 10:48 UTC (permalink / raw
  To: gentoo-commits

commit:     a2db06b45f628b5b4c0353ea9ce3c7af27d2cefd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 10:47:58 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 10:47:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2db06b4

app-i18n/libtabe: Port to EAPI 7

Bug: https://bugs.gentoo.org/697382
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild | 67 ++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 29 deletions(-)

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 3f33549ccf4..62e347d8caf 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
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-10-19 10:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-19 10:48 [gentoo-commits] repo/gentoo:master commit in: app-i18n/libtabe/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2019-10-19 10:48 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox