gentoo resync : 02.01.2018

3 files changed, 10 insertions, 87 deletions

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 945bd5a2804a..d4df681e5dea 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,10 +1,9 @@
 AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 BLAKE2B af19808507b00d941a51756bbc2a48686aad60c0a19626d4b3f549b948254629857eb7ce9a692d790fdf42877de2d6072455b1825347cf9d557e45239088c989 SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1
 DIST gdbm-1.11.tar.gz 811662 BLAKE2B 5936aaac753da4aa5e9a103cfb8a50d33d8ff124846c9224f09aead496b9e76c269b17aaca0b96d3c51b0444910f29e4f9f246f858e5ab849917662711732f4b SHA512 272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c
-DIST gdbm-1.12.tar.gz 841213 BLAKE2B e91d595df6bef489edf005a3e6ea66f3bb64dbb8afc079d82a16796cae53759bb0ab6123929d2375dcc2ff6b1dec15522b9d6a82c22bffa1f7a21a9c01673644 SHA512 25e03dceed6986f1977d304a5ad059ac6c603a88ad4aa18c831ec42df82d68006f2e04b8a3cc400d0a4970750c78ba24a3f84cdff70de9f278cfd854c059699e
 DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad
+DIST gdbm-1.14.tar.gz 893270 BLAKE2B 413b0e866579c697baa8b6ee2412690d3a25aecae1a1bed7b213560a452bf6a41343cabcc5e1c4c3269f796148e7c94782b479790227780e0bd1e8e965eecb87 SHA512 8378920c446f4d343f43af9982acc93be28faf0d6ac709abead03fdd8d47e9ef0226e86179d1e9cdc239c096a11f8d9ccd524747f6114ed9985e1120b8b60c2b
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
 EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.12.ebuild 1898 BLAKE2B f7f4d3587b0db3a0aa8606a4c743c2f225d7f08371a343572097b1ad908433707084dff2c831f52842663d9822e38fc212f281ced6c3d1a4f339322e92ce579c SHA512 70b901cc796d76e15f914528b68d80348415918c32d7fa6fab2600680bfc21a09fdad51c083eabf8913de6554fca2824e74025f797c1002e9d10264c80d99348
 EBUILD gdbm-1.13-r1.ebuild 1835 BLAKE2B 29c065fd646456fd5a34c6a97fcb0970037944293abfd0490eb7780788bceafa6d8ac83aef406dfec4f4901e946d240fad96485f79c6ce278bdf45c42d7ceef5 SHA512 a9f3a564ebbc6e5b2b539138bc2f4ab018e3a9f773005d3a98a177daca764e1f442c8c6901b2e72439d3d3e11d96087fd698a4e6095d4dcc5a74978e0c07fdde
-EBUILD gdbm-1.13.ebuild 1908 BLAKE2B 51eaf9aa599691b493428c85d9d798ea2e534a2255990ee6ba9def27820920770f04c7e0a2cec0f85cc1cab4c505bb6ca069ed0cfd71032c109c1e1e2efea918 SHA512 35b0414c2eec85e9b5ff6b7b8e152c1f59e135161e1d1bb39ccee5339b8871ef50b291a0eb5bf3c8d83694d1a84d0759ffd709411586e5209fd4ef23fbe6ae16
+EBUILD gdbm-1.14.ebuild 1791 BLAKE2B 21cb2319c43ba0e0fbfde666aaf3d364a706cc85d86d0d2c5e1a725a9ce190aa91616be649e66faf47c1a54af94dc61f6e488aa9692f11280d2383eb9555e360 SHA512 41f9aaf1a9a77d6e512f01f3dbbce94997586137a11546e9c6d0e846c8091c8af0bb1bee11f56c7cb8351ddd561b23681b2ab4a54babea313025b76eeb74ae18
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.12.ebuild b/sys-libs/gdbm/gdbm-1.12.ebuild
deleted file mode 100644
index 4748ea363615..000000000000
--- a/sys-libs/gdbm/gdbm-1.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic libtool multilib multilib-minimal
-
-EX_P="${PN}-1.8.3"
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
-	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb exporter nls static-libs"
-
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-EX_S="${WORKDIR}"/${EX_P}
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# gdbm doesn't appear to use either of these libraries
-	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
-	if multilib_is_native_abi && use exporter ; then
-		pushd "${EX_S}" >/dev/null
-		append-lfs-flags
-		econf --disable-shared
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--includedir="${EPREFIX}"/usr/include/gdbm \
-		--with-gdbm183-libdir="${EX_S}/.libs" \
-		--with-gdbm183-includedir="${EX_S}" \
-		$(use_enable berkdb libgdbm-compat) \
-		$(multilib_native_use_enable exporter gdbm-export) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	use exporter && emake -C "${EX_S}" libgdbm.la
-	emake
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/gdbm/gdbm-1.13.ebuild b/sys-libs/gdbm/gdbm-1.14.ebuild
index 1aafca746d33..c617c54ab178 100644
--- a/sys-libs/gdbm/gdbm-1.13.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic libtool multilib multilib-minimal
+inherit autotools flag-o-matic multilib multilib-minimal
 
 EX_P="${PN}-1.8.3"
 DESCRIPTION="Standard GNU database libraries"
@@ -24,7 +24,8 @@ RDEPEND="${DEPEND}"
 EX_S="${WORKDIR}/${EX_P}"
 
 src_prepare() {
-	elibtoolize
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -59,14 +60,8 @@ multilib_src_compile() {
 multilib_src_install_all() {
 	einstalldocs
 
-	use static-libs || find "${ED}" -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 	mv "${ED%/}"/usr/include/gdbm/gdbm.h "${ED%/}"/usr/include/ || die
 }
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}