gentoo resync : 04.08.2018

4 files changed, 15 insertions, 110 deletions

diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 0a5131ccab28..4b292cbdf478 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -4,13 +4,9 @@ AUX mysql++-3.2.1-gold.patch 196 BLAKE2B d4bd1e259cdd8a4c52f0900ddc42a0001156f94
 AUX mysql++-3.2.3-as-needed.patch 19502 BLAKE2B e3c65824c54c8bb0a06f88ab75a60103c47103d21b8a0de74e5f0cd0a824f27de375464c9c8b6bd0ec705f02a026f2d7ceae2656195d8d5e4b88ff10604bf708 SHA512 7b8674d6e1b3ce462e01f2f2d32782c83cdd56ec6288855ea5ff419afc8b139530e1ae4dc104475786856cda4834b11cec3342b8d0447d14f1ae3e77a61580c9
 AUX mysql++-3.2.3-mariadb-10.2.patch 630 BLAKE2B ca95d9f9d62368b91ecab34a8a78a52240908bc27536430de6d8610361e69de95746ae6f1e3f9a7ace2e995fb21d41c06a9bceec668ae9cbdc7ba1ccd034d1ac SHA512 550e5adbdaf04dd6460aeafd0e6cad6cd29124c85f4222216574cc41c7df8559b33ce3eda484eba620a7b97c16bc63e56e744770feccf92348ff066173ad8297
 DIST mysql++-2.3.2.tar.gz 1627115 BLAKE2B 058ed41485474e4283a7200aa57398e85162f697f017ccfde7974b85457bb827d17bfdd522ef46818d42a75751a0eeb6ade39ded73e0265ee6811eb2769df3ea SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7
-DIST mysql++-3.1.0.tar.gz 1944101 BLAKE2B dabfa6491c2535fa974c6ee679d5130853dff1fe8530fc6e0ce1cd2762447c2430f9ccbd45dbfd0c67dfee8019d0446cb04b440d1352813dc76962ca8fea5b80 SHA512 bb57bbf03c80edabff701132877f407ecfa1b76958d7655415c59ec939e80fbe250951a16c3d5ea6988dd2c778b623605cb65bf810501f392be2f6b6ad07ad90
 DIST mysql++-3.2.1.tar.gz 2256735 BLAKE2B 8d5e713926a405fa9b93af690554595d8cc79cc25af216103df241f549fd93e7fa051ef5f1a27e7c67825408b8310886bedaeb69bd80b6ea6cf1c320a94cc9d2 SHA512 936021dcf8568d3ee0c935e5c552acc6fd2b57849d1cc60e68b45b690d798d7bfbc1dedc04e21417d1b4c27017b471e4f6cb70de7f1904949b9222090a777de9
-DIST mysql++-3.2.2.tar.gz 3257359 BLAKE2B 180ffaa4d5a198795386f46a6be3bc6f50ded373057b5c6fe618ae3d0976ced8288647bc1beac64fbd7c93aab5f2a79ced4ecc947101e3118b39aa0b40b1eb1a SHA512 eb4250394027f1baafa660711d8221c9eb3a70ff2a37331c58807a97a67b84f792290b24830e851b2421f6ccf2867e9f3597af3af41530256c44521a4c4a55b1
 DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b23d33983a719c892bbd1002f3986206df6cfef54316f11aa480f18dbc0a2cf6944f9572f3a7dca24cdb73099eb9 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a
-EBUILD mysql++-2.3.2.ebuild 1317 BLAKE2B ad98d1f0e15bccd6e8ca66359e24e657d732a238e81bfffc8292b2fe6d5fc18dba15bd765acae2926d9e71647ffe493100abb6a5de98ac54d9bed336fb01dc44 SHA512 353023121c04882aad8a0c674ade803111e6922bfb9974d91b65179af23a264d5767404ef2eb77e50a685c89d55509196e21a8c397d98d072ab797458d2a81df
-EBUILD mysql++-3.1.0.ebuild 1238 BLAKE2B 5b6a96a7a9b263d06a762b38ab5daabf07116e74ae35fa3500f732d4f3c5120121aaa413142304912c95c9dae73af58d43e0246c6b32f89207059733caa4fa81 SHA512 cbd918e3719d0ddb12da283c9f555cea25737ba38ba0e42912e9f8eb134ddafba3f4e0ff13665d3b9336a039f3ff43adbdb969e4a0a3953283d652836de1d3b1
+EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
 EBUILD mysql++-3.2.1.ebuild 901 BLAKE2B 0e6c3feef947f749d7124284dad8ce91d14fed57d7a24730482dea19646a8b675113577138d4d81dd3e803df74f13a91fe40b1959fa145bf676b8d301a24d588 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31
-EBUILD mysql++-3.2.2.ebuild 853 BLAKE2B d2ed354d375d69fd73f15aa497dd3e0bb21fcc6c5784141b2585277f345e3147f37910e26a453c749d6cfcb578f6afb97e8baa65ca8ed967a39c78dc1211b50a SHA512 f617976eaef20a31071983c10ea89ecff0f8cd440c0a040f6b419fd2e109229d0db4bff08dbbdc01ff17937a7ab46f17560b3c81cf18226d08a3739c92ca475d
 EBUILD mysql++-3.2.3.ebuild 1565 BLAKE2B 609c5e41804c0ae8520779c3723b56b766c4bf95e52e645ede9f7ac85e843738c3ebcc4f3deee9f35eafb29ed90a88359b7d78628ad8e0228c5dc5bd7ef967ae SHA512 98660ccefd411d7aa549d05264438be54f0bfdd101c4d85f46a5eea431b9efd4d9ec3385842e5342e8c993a69c12b13a7e655d046d62defa397f9244c9b7634b
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2-r1.ebuild
index 7167c329599b..6fc8b2c27451 100644
--- a/dev-db/mysql++/mysql++-2.3.2.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2-r1.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
+HOMEPAGE="http://tangentsoft.net/mysqlpp/"
 SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		>=sys-devel/gcc-3"
+RDEPEND="dev-db/mysql-connector-c:="
+DEPEND="${RDEPEND}"
 
-src_prepare() {
+HTML_DOCS=( doc/html/{refman,userman} )
+DOCS=( README{,.cygwin,.examples,.mingw,.unix,.vc} CREDITS ChangeLog
+	HACKERS Wishlist doc/pdf doc/README.devel doc/README.manuals
+	doc/refman doc/ssqls-pretty doc/userman )
 
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-gcc-4.3.patch
 
 	for i in "${S}"/lib/*.h ; do
 		sed -i \
@@ -28,6 +29,8 @@ src_prepare() {
 			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
 			"${i}" || die "Failed to sed ${i} for fixing MySQL includes"
 	done
+	sed -i 's/mysqlclient_r/mysqlclient/' "${S}/configure" || die
+	eapply_user
 }
 
 src_configure() {
@@ -44,12 +47,3 @@ src_configure() {
 	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	econf ${myconf}
 }
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	dodoc README* CREDITS ChangeLog HACKERS Wishlist
-	dohtml -r doc/html/*
-	rm -r doc/html || die
-	dodoc -r doc/*
-}
diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild
deleted file mode 100644
index b945531b392b..000000000000
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/mysql-4.0"
-DEPEND="${RDEPEND}
-		|| ( >=sys-devel/gcc-3 >=sys-devel/gcc-apple-4 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-gcc-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-gold.patch
-
-	for i in "${S}"/lib/*.h ; do
-		sed -i \
-			-e '/#include </s,mysql.h,mysql/mysql.h,g' \
-			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
-			"${i}"
-	done
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use prefix || local EPREFIX=
-	myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
-
-	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# install the docs and HTML pages
-	dodoc README* CREDITS* ChangeLog HACKERS.txt Wishlist doc/ssqls-pretty
-	dodoc -r doc/pdf/ doc/refman/ doc/userman/
-	dohtml -r doc/html/
-}
diff --git a/dev-db/mysql++/mysql++-3.2.2.ebuild b/dev-db/mysql++/mysql++-3.2.2.ebuild
deleted file mode 100644
index a7f6809512a8..000000000000
--- a/dev-db/mysql++/mysql++-3.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="virtual/libmysqlclient:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.1-gold.patch"
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	dodoc CREDITS* HACKERS.txt Wishlist doc/ssqls-pretty
-	dodoc -r doc/pdf/ doc/refman/ doc/userman/
-	dohtml -r doc/html/
-}