gentoo resync : 10.02.2019

3 files changed, 18 insertions, 17 deletions

diff --git a/dev-libs/libhome/Manifest b/dev-libs/libhome/Manifest
index 257f9ac9ebd1..76fbfcf685cf 100644
--- a/dev-libs/libhome/Manifest
+++ b/dev-libs/libhome/Manifest
@@ -1,5 +1,5 @@
-AUX libhome-0.10.2-Makefile.patch 2591 BLAKE2B b640f87d09500d981db3cb4407db9c3c40409bba90fe9bffd35dc1fbf41137bb849530d28c98dbd280be8dca16abb6713cfb055ba65a4cd1fa437f36a9b1836d SHA512 e09c736127e015c4e68a572626c04162fc42736c6e8628772f268fe2df164e78e36a2d213b17072dfba31d31f0063615da89e5ceac176b2dd93b56a4c192b020
+AUX libhome-0.10.2-Makefile.patch 2595 BLAKE2B 1ea80fd25b2f0d15cad374e132c37b1cdb26167cae9a2e1bdcc532230b1193057e10577d5a019c21bfed1b6aabdc41452a52397a7268ab0cfe4ba480040bc63e SHA512 c5594a56637570d76225a72a490a6e2a1dc1525c2a539e2a8bba9580364b449868e4f66bdddc9662e5a600658142e582c426fbceb4f68335b646a7cd1b7af692
 AUX libhome-0.10.2-ldap_deprecated.patch 436 BLAKE2B dac750c9499423992a236c1c1370c4e2b9b219b546ac9b87c1ac9aba7277592f52dd175e568226588315bab6110fc48e11d859193b1b454734e10c6ff9f3cfc0 SHA512 9837639846acb2e89c92e0b821faf40d9ee82af9f6837ea69b3d435da6433c6095b45dbf09178de5d361993405141bf9ac7b91e8f6a0bda65d038f80c6897ae7
 DIST libhome-0.10.2.tar.gz 286453 BLAKE2B bb2356fef6358b849896c665760174decbf5f83f70380c855c519c6a8cde37e053af70962f7552ffdd581b1af559bbc4a74d7d8ccedad39fa4a178ded394436c SHA512 9f144b6aeb8e01f5ca2f8f90c5289d4449895e2eddbfd2d8d9b1828bb203fd8f68c224c0f068ffabfa5ee1514f9b756cb2499f862418d793eb8d06ae960447a9
-EBUILD libhome-0.10.2-r1.ebuild 1208 BLAKE2B ada5f7468f4e01ddcbc47b7319e4f4a9383a7fd8b3c177d26008c14881aec932e0300a4cc5cc67e7c4abdeb438e3cfbb8b95737df89bc8be8e343250c9faf299 SHA512 6d994881ee0834575f23c8832c7526d5a601fef122cf3f2de17b7a866f81640227ef0880b5d9cea3287a71e83f0cef10067117d2932c2b039b6575002cbd8e94
+EBUILD libhome-0.10.2-r2.ebuild 1198 BLAKE2B 577f78ce8270b6bd79db641ac1feef295e48bab090a358342dfaafb3bb242c58fe151c8be177b77cba84fec153144af52fc06bd4d60b6380914d5d3fdeb767b3 SHA512 e454ca4b1359063b151a91c53ad149b5e51a4acde59208a8b3cb688cc94c2f6785224dcfd6921801d75ba0a616d4373dd1f35c7afe6981c75abb67afde3c4124
 MISC metadata.xml 240 BLAKE2B 2e3833d1ad4ea9595d87b465cc7ddc1c7265e408573c1cccd947df928faa1db495ba24ad4417ba6dc46a8ddbe36876775dfda70309472348ac6273554b8e62da SHA512 b81e5b5547e3dc86326d624d771f3c7a55f6b85989c0de3827fd9df823f7fef49d66e6ba814d1ee6ee0e02bbc9705f00aa74ea6d247abe3db5cf3a57e4171455
diff --git a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
index 54915fd4bb04..371335b0bec8 100644
--- a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
+++ b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -61,7 +61,7 @@
  LIBTOOL=./libtool
  
diff --git a/dev-libs/libhome/libhome-0.10.2-r1.ebuild b/dev-libs/libhome/libhome-0.10.2-r2.ebuild
index ef3cfe46b6ca..b94cfd3c8377 100644
--- a/dev-libs/libhome/libhome-0.10.2-r1.ebuild
+++ b/dev-libs/libhome/libhome-0.10.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools db-use eutils
+inherit autotools db-use
 
 DESCRIPTION="libhome is a library providing a getpwnam() emulation"
 HOMEPAGE="http://pll.sourceforge.net"
@@ -12,20 +12,24 @@ SRC_URI="mirror://sourceforge/pll/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="berkdb ldap mysql pam postgres"
+IUSE="berkdb ldap mysql pam postgres static-libs"
 
 DEPEND="berkdb? ( >=sys-libs/db-4 )
 	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c:= )
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql[server] )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.2-Makefile.patch
+	"${FILESDIR}"/${PN}-0.10.2-ldap_deprecated.patch
+)
+
 src_prepare() {
 	rm -f aclocal.m4
 
-	epatch "${FILESDIR}"/${PN}-0.10.2-Makefile.patch
-	epatch "${FILESDIR}"/${PN}-0.10.2-ldap_deprecated.patch
+	default
 
 	# bug 225579
 	sed -i -e 's:\<VERSION\>:__PKG_VERSION:' configure.in
@@ -43,13 +47,10 @@ src_configure() {
 		$(use_with mysql) \
 		$(use_with pam) \
 		$(use_with postgres pgsql) \
-	|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
+	use static-libs || find "${D}" -name '*.la' -delete
 }