[gentoo-commits] repo/gentoo:master commit in: sci-libs/libpdb++/files/, sci-libs/libpdb++/

[Justin Lecher]

commit:     92235e3e78ea43eb013d1bd5a89f8f4e6b309c6d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 18:55:11 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 18:59:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92235e3e

sci-libs/libpdb++: Bump EAPI to 6

drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/libpdb++/files/040728-dynlib.patch | 12 --------
 sci-libs/libpdb++/libpdb++-040728-r1.ebuild | 10 ++++---
 sci-libs/libpdb++/libpdb++-040728.ebuild    | 45 -----------------------------
 3 files changed, 6 insertions(+), 61 deletions(-)

diff --git a/sci-libs/libpdb++/files/040728-dynlib.patch b/sci-libs/libpdb++/files/040728-dynlib.patch
deleted file mode 100644
index a9792afb52a..00000000000
--- a/sci-libs/libpdb++/files/040728-dynlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libpdb++/Makefile b/libpdb++/Makefile
-index bbf0778..286a638 100644
---- a/libpdb++/Makefile
-+++ b/libpdb++/Makefile
-@@ -32,6 +32,7 @@ install:	$(LIBARCH)
- 
- $(LIBARCH):     $(OBJS)
- 		@echo "Loading $(LIBARCH) ... "
-+		$(CXX) $(LDFLAGS) -shared -Wl,--soname,libpdb++.so.0 -o libpdb++.so.0.1 $(OBJS)
- 		@ar cru $(LIBARCH) $(OBJS)
- 		@$(RANLIB) $(LIBARCH)
- 		@echo "done"

diff --git a/sci-libs/libpdb++/libpdb++-040728-r1.ebuild b/sci-libs/libpdb++/libpdb++-040728-r1.ebuild
index aadcbd492ac..c4850098afd 100644
--- a/sci-libs/libpdb++/libpdb++-040728-r1.ebuild
+++ b/sci-libs/libpdb++/libpdb++-040728-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="PDB Record I/O Libraries -- c++ version"
 HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html"
@@ -20,12 +20,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${PN}
 
+PATCHES=( "${FILESDIR}"/${P}-dynlib+flags.patch )
+
 src_unpack() {
 	"${EPREFIX}/usr/bin/unshar" "${DISTDIR}"/${A} || die
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-dynlib+flags.patch
+	default
 	tc-export CXX AR RANLIB
 }
 

diff --git a/sci-libs/libpdb++/libpdb++-040728.ebuild b/sci-libs/libpdb++/libpdb++-040728.ebuild
deleted file mode 100644
index 2a6e4b55c4a..00000000000
--- a/sci-libs/libpdb++/libpdb++-040728.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PDB Record I/O Libraries -- c++ version"
-HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html"
-SRC_URI="mirror://gentoo/${P}.shar"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/sharutils"
-
-S="${WORKDIR}"/${PN}
-
-src_unpack() {
-	"${EPREFIX}"/usr/bin/unshar "${DISTDIR}"/${A} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-dynlib.patch
-}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CCFLAGS="${CXXFLAGS} -fPIC -felide-constructors" \
-		|| die
-}
-
-src_install() {
-	dolib.a ${PN}.a || die
-	dolib.so ${PN}.so.0.1 || die
-	dosym ${PN}.so.0.1 /usr/$(get_libdir)/${PN}.so.0
-	dosym ${PN}.so.0.1 /usr/$(get_libdir)/${PN}.so
-	insinto /usr/include/${PN}
-	doins *.h || die
-}