gentoo resync : 21.09.2018

8 files changed, 8 insertions, 75 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 0def2517cb58..f38f69713bad 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest
index 38b79c36fe45..25cb47c23036 100644
--- a/sys-auth/libnss-mysql/Manifest
+++ b/sys-auth/libnss-mysql/Manifest
@@ -1,4 +1,4 @@
 AUX libnss-mysql-1.5_p20060915-no-automagic-debug.diff 610 BLAKE2B 2c1473fca6eddd1cf66db23268ca24dc824b90a2b155202110329c39083daa696142c85cfe50613a7da356275743a797f066d60d2c80c9b330aaac5c24a65d30 SHA512 f8e33bd221dd1662933510ccf9648a152e78c38e6b0d155ae82c3eff49f0f621b3661aa07bf8d8d84b53e14a048ea6765561c16c38e07286cb93bee6a51a91e7
 DIST libnss-mysql-20060915.tgz 689970 BLAKE2B 147b5bb6c2fb53ca18f6db87054fa6665829671e9abdd7aa439287e301fc2d5ed4c9e2e5968ce6dacb4f74d86debb0c26d5cda56c6fe8f64e92ff3c9eba26a85 SHA512 fc92438b413b175b9bcead222013eab3bf63088a33ece0c4b6cc69edbefb9cc9145138ce786059acf502c2378a2af45588a5a506e45928b9ac600fe05e62e0c7
-EBUILD libnss-mysql-1.5_p20060915-r3.ebuild 1192 BLAKE2B 56103bc403c50c5f505049fe77ee017ef0471dae327485d148567c7b7a403aefc5cb69ff06695c4a07f50a6bcc3fd052ac599bd2567ce274a5ece2e87b397ed8 SHA512 9066811c0315991b612d69a4e5dc0f5c5b77b58d55620f253ffe5e794402d4b3b43df53d68d418f90939998cd4ce67953108dc2bc4e00e19f4ab01ac50b5bec8
+EBUILD libnss-mysql-1.5_p20060915-r4.ebuild 1202 BLAKE2B 0368413dbc87874e23b57a30867880504c17257f15fb91afa312a745f196d2ec906f5b51d66d0422e15a0454728fadbb5c51e4a7cb7cb411f92c5be544369c1a SHA512 edc809099f8b10ece31fb9392002d045af79391601bfccc425fd5f27ea8ad83db06f182c06a13ddc7617029ca23bdddae8535dff3e5d58b1c437287fd36e0b93
 MISC metadata.xml 325 BLAKE2B 894a3b266d3cba95496ca172f31fdd30d900bf174fef1f475c97b9ebd0b6c6e728c33b30741b17b8cd6e8d521a965392aa3ad484d2d3a6e1d8970aca40d61495 SHA512 b4755442527c73f4bd3fc338ad753c6067b94c9462f92bf36b6bef75ebe1befc397cc177ea3e4fe0477b1de767d977108ab6a89e01e18e2386cb23548682ec8b
diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r4.ebuild
index 91e9d0e6c624..4857774aea75 100644
--- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild
+++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib autotools
+inherit autotools
 
 KEYWORDS="amd64 ppc ~sparc x86"
 
@@ -14,16 +14,17 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-DEPEND="virtual/mysql"
+DEPEND="dev-db/mysql-connector-c:="
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 
 DOCS=( AUTHORS DEBUGGING FAQ INSTALL NEWS README THANKS
 	TODO UPGRADING ChangeLog
 )
+PATCHES=( "${FILESDIR}"/${P}-no-automagic-debug.diff )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-automagic-debug.diff
+	default
 	eautoconf
 }
 
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index d6511184c4a7..55e9ef1b420c 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -1,7 +1,3 @@
-AUX pam_mysql-0.7_rc1-link-to-pam.diff 453 BLAKE2B 97e657ed176acdae11d04163df586876c6a4061379ef1eddd5f24e329711e0cf9281272a6af792890057347afa521dd0969fe05b4ea6d0d678157e928201fcd1 SHA512 4a2f714cbe7e951a95ef2a4d22df702b6c3545f02333e30fafc69bf374dceb7f662107894df0c3cd0f1c8ceac241c85af4fb689fd6526e8b81350fc3f6a6e278
-AUX pam_mysql-0.7_rc1-memleak.diff 274 BLAKE2B 9efb6d3c3be48c470f91f8cb479ee683b761f1d6cf3883673b82afc8ee01e43b1a5fcd84cd602cc273ad7810d62e5f5a28d69a43492d2c62202bd4a164d9492a SHA512 1ca65d2ea0eea7859863769a9763301d795c24aada9eb33b625789647fd076dcf976ab291f31149bf0d04a3482c150ec980aba81ec56ee01f57c724d80cee5f0
-DIST pam_mysql-0.7RC1.tar.gz 335240 BLAKE2B 5351da14d7e9bd2693c9ca0595a472fffb86818fc7e74313f3235675be8fd5daef99c2d14f2bd19c370a19592cc0a46181fd3a3411ef5a8d3b26059a16673d75 SHA512 c057999c62d29dfa7a07db9a8d33d0cf0377dae4770c73019bd85f67c9c92fc9dac36fa606739162a5f7b0f9fbd849e5833fee827febfe4af883b8c2ddbd8b4f
 DIST pam_mysql-0.8.1.tar.gz 49613 BLAKE2B 1e3f6b0c8a11c8d328300fc820ddbbcd1601735de611e9317aab8f26ab2fbcf0f704e7a2c26de347fe9c4088c8171f0c278cd92e1668671871e5cd79db981241 SHA512 68aecc83c026c7616211a46b80f96fe822c8bd069a5ab6e9b170607bddac0dabe20410f78a1ac61ca1c1b2724ed0f0d99694d34bf28763270da3771c9ef05faf
-EBUILD pam_mysql-0.7_rc1-r5.ebuild 1155 BLAKE2B e3c0fc39955f888bac0ecb71acf82a22b787781961bd95be4422d52ac4bfc94f76db9861f7a95af61df1188d777a738b0d0fb9d32ce68622fca10f032193776b SHA512 2345868d1d5e30926a38e3a6e6a07f9cbfbc040f059fb16509704b53352a07c598a5d6ca24b6d08f0a77f8fe24fee785cda9e31327acbcd7b600d4e483330921
-EBUILD pam_mysql-0.8.1.ebuild 882 BLAKE2B 5f3612babacf8e4a35db093b6e0b585359694ee117c730d92a54bb94ae98a6cb657ffc021c03dfc9b54c8ec55fc243896ac9d7ba152c27cff70cbf8e77af1f58 SHA512 ef165887086b1afc301c4a0ba1077708ba7164737f0e254d4f948388a5fab0ee6b82da9cf2238f2240a48aa56c88736fe189dddcb5557ee0552965f7c1a75d75
+EBUILD pam_mysql-0.8.1-r1.ebuild 893 BLAKE2B 0ea6c74e1ff7b29d66b63e0a6f86fafe1a3d133f6fd580f1694a88434952ebd1180c99035045c3e9a3a8e6abb3de310bc9ddb4b3c02f57cf8983960878d5a169 SHA512 1743eb0268415806056f48f477b789583ed7b7da74e64fec7b1253add11a4d8de3dfe47bed4594123c6485b396af8158f0230a312269703438e4f35654cecb1b
 MISC metadata.xml 404 BLAKE2B aa7d8e4f9b1d52a6b238bca975f697debb58355314621957db0afaea72490a1e7b386ef05f95d9707d68bee9178b6848affeeadcad6800b0746912916cf2d682 SHA512 d78e3f912015ea18a9385b21c0f7f4d29a2af8773c0a154fd41a1a16abc71af8a7d43b71fa66f835be1b44d3afc22f0333e741313dfccb6446d628962d25915b
diff --git a/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-link-to-pam.diff b/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-link-to-pam.diff
deleted file mode 100644
index 0b32b37e9e05..000000000000
--- a/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-link-to-pam.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- pam_mysql-0.7RC1/Makefile.am	2005-09-20 07:43:44.000000000 +0200
-+++ pam_mysql-0.7RC1-1/Makefile.am	2011-09-13 09:21:53.198200066 +0200
-@@ -3,5 +3,6 @@
- noinst_FILES=pam_mysql.la pam_mysql.a
- pam_mysql_la_SOURCES=pam_mysql.c
- pam_mysql_la_LDFLAGS=-module -avoid-version
-+pam_mysql_la_LIBADD=-lpam
- INCLUDES=@INCLUDES@
- EXTRA_DIST=COPYING NEWS README CREDITS ChangeLog INSTALL pam_mysql.spec.in install-sh missing mkinstalldirs pkg.m4 pam_mysql.spec
diff --git a/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-memleak.diff b/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-memleak.diff
deleted file mode 100644
index e746be72029d..000000000000
--- a/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-memleak.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- pam_mysql-0.7RC1/pam_mysql.c	2006-01-09 11:35:59.000000000 +0100
-+++ pam_mysql-0.7RC1-1/pam_mysql.c	2011-10-18 20:26:38.655425994 +0200
-@@ -2338,6 +2338,7 @@
- 	}
- 
- 	mysql_close(ctx->mysql_hdl);
-+	mysql_library_end();
- 
- 	xfree(ctx->mysql_hdl);
- 	ctx->mysql_hdl = NULL;
diff --git a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild
deleted file mode 100644
index 1b2408a564f2..000000000000
--- a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils pam
-
-DESCRIPTION="pam_mysql is a module for pam to authenticate users with mysql"
-HOMEPAGE="http://pam-mysql.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/pam-mysql/${P/_rc/RC}.tar.gz"
-DEPEND="
-	openssl? ( dev-libs/openssl:0= )
-	>=sys-libs/pam-0.72:0=
-	virtual/mysql:0=
-	"
-RDEPEND="${DEPEND}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="openssl"
-S="${WORKDIR}/${P/_rc/RC}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-link-to-pam.diff"
-	"${FILESDIR}/${P}-memleak.diff"
-	)
-DOCS=( CREDITS ChangeLog NEWS README )
-AUTOTOOLS_AUTORECONF="yes"
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-src_prepare() {
-	# Update autotools deprecated file name and macro for bug 468750
-	mv configure.in configure.ac || die "configure rename failed"
-	sed -i s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/ configure.ac || die "sed failed"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_with openssl) )
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install libdir="$(getpam_mod_dir)"
-}
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild
index ebe98f844d91..1cdc2f481e9d 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/NigelCunningham/pam-MySQL"
 SRC_URI="https://github.com/NigelCunningham/pam-MySQL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 DEPEND="
 	>=sys-libs/pam-0.72:0=
-	virtual/mysql:0=
+	dev-db/mysql-connector-c:0=
 	openssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="${DEPEND}"