diff options
Diffstat (limited to 'dev-db/soci')
| -rw-r--r-- | dev-db/soci/Manifest | 4 | ||||
| -rw-r--r-- | dev-db/soci/soci-3.2.2.ebuild | 46 | ||||
| -rw-r--r-- | dev-db/soci/soci-3.2.3.ebuild | 44 |
3 files changed, 25 insertions, 69 deletions
diff --git a/dev-db/soci/Manifest b/dev-db/soci/Manifest index aa389d22133c..d6300739bed3 100644 --- a/dev-db/soci/Manifest +++ b/dev-db/soci/Manifest @@ -1,5 +1,3 @@ -DIST soci-3.2.2.zip 518502 BLAKE2B 0e043c1390249e43a66d3c858178b3cfd70a5a53748f52bc3fc0688daf2b3e38a3bf682dbd48a7e40ef8c194d783169f5966f0f60166f858d21609da3fc1b234 SHA512 36fa977e8827ec546ec85be45d78bb21b2700ee7838d144e6f6ac91cc70242cbe8ce968092146e2b29d52fe1022b9287cff7465c156a49c0ffb1dde6d89964ab DIST soci-3.2.3.zip 508929 BLAKE2B e1a83172391508506744b18ac0b18d69bec34bfbd31d9156b2cb786cdb7cdd8a99ace21d1286a2c4432ba18e18dedc4f390075a25a30fa2e45f36d802661ddb2 SHA512 dd9b7eaf535502e3230eada4d4d019963d2c9cf59b69fff5d466b4fc00976fa08f7b0199a0e4564a0395d0d30095b97aa1d613dfbaa329feb077ece3b0efacdf -EBUILD soci-3.2.2.ebuild 1234 BLAKE2B 6c3839269973ffc766efa11733006167187bbe30bd11bc7f16fa03485d413059e99fd1c47f069fe827311d392df27e15d5678447bad0ac392ad170a343de325c SHA512 0e7eee3a2fd94d6d9a0042ee734d9c57586bde432b65ae75a2d986cdd42e7d589524b4d0a99d250a055eb02f50af1028e199dd8286ad119f58c714a2f8bfb3b6 -EBUILD soci-3.2.3.ebuild 1234 BLAKE2B 6c3839269973ffc766efa11733006167187bbe30bd11bc7f16fa03485d413059e99fd1c47f069fe827311d392df27e15d5678447bad0ac392ad170a343de325c SHA512 0e7eee3a2fd94d6d9a0042ee734d9c57586bde432b65ae75a2d986cdd42e7d589524b4d0a99d250a055eb02f50af1028e199dd8286ad119f58c714a2f8bfb3b6 +EBUILD soci-3.2.3.ebuild 1235 BLAKE2B ce606fe16c860275ac1eb0d9e165c3bd6cf57ada31fc1698b30854ff9f3dfc6ffbbf4ec523466c4d6f06dd79bbaa800aef49885679bdd55dd6b89121f4868d32 SHA512 331534dc170ae1cf0d986069bca6dea98b4e97868c155972ae2ba28f15499bcf26af9abf15549a5b39102f592cc535be969f24699f1f3cb6f39c4b465211b1cb MISC metadata.xml 343 BLAKE2B 7257e5f29bfd60e7231870e28d745ea123af37110ddf907c7a4dedb4e984a330e62f02f61b59075ee7eb30a77f89e5b3edc72070a18158fa5cbf6e5bb3596908 SHA512 a3441b5c5f7127af874a08bc9e05dd95f1594167906383c44fcfb9620e52fdabdd90b23c2cbc6f082699150b1593b4600f7a9eae54c799f501b95ca9022d83c7 diff --git a/dev-db/soci/soci-3.2.2.ebuild b/dev-db/soci/soci-3.2.2.ebuild deleted file mode 100644 index 390012ef0f71..000000000000 --- a/dev-db/soci/soci-3.2.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Makes the illusion of embedding SQL queries in the regular C++ code" -HOMEPAGE="http://soci.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" -LICENSE="Boost-1.0" -SLOT="0" -IUSE="boost doc +empty firebird mysql odbc oracle postgres sqlite" - -DEPEND="boost? ( dev-libs/boost ) - firebird? ( dev-db/firebird ) - mysql? ( virtual/mysql ) - odbc? ( dev-db/unixODBC ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND=${DEPEND} - -src_configure() { - local mycmakeargs="$(cmake-utils_use_with boost ) - $(cmake-utils_use empty SOCI_EMPTY) - $(cmake-utils_use_with firebird FIREBIRD) - $(cmake-utils_use_with mysql MYSQL) - $(cmake-utils_use_with odbc ODBC) - $(cmake-utils_use_with oracle ORACLE) - $(cmake-utils_use_with postgres POSTGRESQL) - $(cmake-utils_use_with sqlite SQLITE3) - -DWITH_DB2=OFF" #use MYCMAKEARGS if you want enable IBM DB2 support - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc AUTHORS CHANGES - if use doc; then - dohtml -r doc/* - fi -} diff --git a/dev-db/soci/soci-3.2.3.ebuild b/dev-db/soci/soci-3.2.3.ebuild index 390012ef0f71..f31882f3e189 100644 --- a/dev-db/soci/soci-3.2.3.ebuild +++ b/dev-db/soci/soci-3.2.3.ebuild @@ -1,20 +1,20 @@ -# 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 cmake-utils -KEYWORDS="~amd64 ~x86" - DESCRIPTION="Makes the illusion of embedding SQL queries in the regular C++ code" HOMEPAGE="http://soci.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.zip" + LICENSE="Boost-1.0" SLOT="0" -IUSE="boost doc +empty firebird mysql odbc oracle postgres sqlite" +KEYWORDS="~amd64 ~x86" +IUSE="boost doc +empty firebird mysql odbc oracle postgres sqlite static-libs test" -DEPEND="boost? ( dev-libs/boost ) +RDEPEND=" firebird? ( dev-db/firebird ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) @@ -22,25 +22,29 @@ DEPEND="boost? ( dev-libs/boost ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) " -RDEPEND=${DEPEND} +DEPEND="${RDEPEND} + boost? ( dev-libs/boost ) +" src_configure() { - local mycmakeargs="$(cmake-utils_use_with boost ) - $(cmake-utils_use empty SOCI_EMPTY) - $(cmake-utils_use_with firebird FIREBIRD) - $(cmake-utils_use_with mysql MYSQL) - $(cmake-utils_use_with odbc ODBC) - $(cmake-utils_use_with oracle ORACLE) - $(cmake-utils_use_with postgres POSTGRESQL) - $(cmake-utils_use_with sqlite SQLITE3) - -DWITH_DB2=OFF" #use MYCMAKEARGS if you want enable IBM DB2 support + local mycmakeargs=( + -DWITH_BOOST=$(usex boost) + -DSOCI_EMPTY=$(usex empty) + -DWITH_FIREBIRD=$(usex firebird) + -DWITH_MYSQL=$(usex mysql) + -DWITH_ODBC=$(usex odbc) + -DWITH_ORACLE=$(usex oracle) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_SQLITE3=$(usex sqlite) + -DSOCI_STATIC=$(usex static-libs) + -DSOCI_TESTS=$(usex test) + -DWITH_DB2=OFF + ) + #use MYCMAKEARGS if you want enable IBM DB2 support cmake-utils_src_configure } src_install() { + use doc && local HTML_DOCS=( doc/. ) cmake-utils_src_install - dodoc AUTHORS CHANGES - if use doc; then - dohtml -r doc/* - fi } |