gentoo resync : 25.08.2018

4 files changed, 53 insertions, 50 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ceea4093e199..ab24f4630d00 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cppdb/Manifest b/dev-db/cppdb/Manifest
index 381f67da2d0e..5bf0db020ed3 100644
--- a/dev-db/cppdb/Manifest
+++ b/dev-db/cppdb/Manifest
@@ -1,3 +1,3 @@
 DIST cppdb-0.3.1.tar.bz2 251449 BLAKE2B 13a59b50b53e276c3714c35a11dee09054d3017d4c60335028c1e41dece749e6b13e94cd6ca4ad40e8bd47c5530ff3310c5735b373ee7289afe657f31c6186de SHA512 19e60becbffef7a252eda5fdd5821b44c2eeb5d69e84cf46e89ed6af3cea315f3cfe7b2cc4f62fbe154be8abdad3363761dd0252f94671421010273eeae65678
-EBUILD cppdb-0.3.1-r1.ebuild 1353 BLAKE2B 5ed160a4f5dbd555bd7885e77302a04b47f0cfe6b36ad0b44e5c069596a19b4ec71484a867cda55992f41a339b3fc06a969a80639f961a95a38c37ef06f34a49 SHA512 bb1a2d18a3ec7843f519c788d59697b53cfc10c321b4caa1dba4910b764246f542794fae49f1b4971d6521d7ef191573cf45c9c161254ede6871f147af60c4bb
+EBUILD cppdb-0.3.1-r2.ebuild 1286 BLAKE2B b202c12e33e2bcf11bb01b9299c58e28322457f4c28e4ab246efc94c95e56ce7c23d3e0ef4150284868f48da8c5cfd8d8a6aa9a1887b3c076747d82808057474 SHA512 3a32b2e277ddfd2f4ecb98d600c414a5e43785e321ab78a593757ed408fa62674a4360340a12a1dc570177e3d03987aef787d757eb29d899fe4af6a31261ea90
 MISC metadata.xml 767 BLAKE2B 6012059a499f2c722e9eaac433a605eb8473f047f1f78543da7a08d6fb816bc3e83726e53285303dd1c14a09c2955d8d03e6fff9a617e2cc2ead27d329eb5c9e SHA512 930b662cc22169de50ef67af931799380b229c09a0b9b82c1ace9fa0abe75a685a3c3793c02cb85ac3d8f18f6450ea178e1a097e42e4d84c024286da9cbc085a
diff --git a/dev-db/cppdb/cppdb-0.3.1-r1.ebuild b/dev-db/cppdb/cppdb-0.3.1-r1.ebuild
deleted file mode 100644
index bcc4bd16cdc4..000000000000
--- a/dev-db/cppdb/cppdb-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="An SQL connectivity library for platform and database independent connectivity"
-HOMEPAGE="http://cppcms.com/sql/cppdb/"
-SRC_URI="mirror://sourceforge/cppcms/${P}.tar.bz2"
-
-LICENSE="|| ( Boost-1.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples mysql mysql_internal odbc odbc_internal postgres postgres_internal sqlite sqlite_internal"
-
-DEPEND="
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_disable mysql MYSQL)
-		$(cmake-utils_use mysql_internal MYSQL_BACKEND_INTERNAL)
-		$(cmake-utils_use_disable odbc ODBC)
-		$(cmake-utils_use odbc_internal ODBC_BACKEND_INTERNAL)
-		$(cmake-utils_use_disable postgres PQ)
-		$(cmake-utils_use postgres_internal PQ_BACKEND_INTERNAL)
-		$(cmake-utils_use_disable sqlite SQLITE)
-		$(cmake-utils_use sqlite_internal SQLITE_BACKEND_INTERNAL)
-		-DLIBDIR=$(get_libdir)"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		rm docs/build.txt || die
-		dodoc -r docs/*
-		dohtml -r html/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-db/cppdb/cppdb-0.3.1-r2.ebuild b/dev-db/cppdb/cppdb-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..b7b59c0c0d76
--- /dev/null
+++ b/dev-db/cppdb/cppdb-0.3.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="SQL connectivity library for platform and database independent connectivity"
+HOMEPAGE="http://cppcms.com/sql/cppdb/"
+SRC_URI="mirror://sourceforge/cppcms/${P}.tar.bz2"
+
+LICENSE="|| ( Boost-1.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples mysql mysql_internal odbc odbc_internal postgres postgres_internal sqlite sqlite_internal"
+
+DEPEND="
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MYSQL=$(usex !mysql)
+		-DMYSQL_BACKEND_INTERNAL=$(usex mysql_internal)
+		-DDISABLE_ODBC=$(usex !odbc)
+		-DODBC_BACKEND_INTERNAL=$(usex odbc_internal)
+		-DDISABLE_PQ=$(usex !postgres)
+		-DPQ_BACKEND_INTERNAL=$(usex postgres_internal)
+		-DDISABLE_SQLITE=$(usex !sqlite)
+		-DSQLITE_BACKEND_INTERNAL=$(usex sqlite_internal)
+		-DLIBDIR=$(get_libdir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use doc; then
+		rm docs/build.txt || die
+		dodoc docs/*
+		local HTML_DOCS=( html/. )
+	fi
+	cmake-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}