diff options
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/Manifest.gz | bin | 15212 -> 15213 bytes | |||
-rw-r--r-- | dev-db/opendbx/Manifest | 2 | ||||
-rw-r--r-- | dev-db/opendbx/opendbx-1.4.6-r6.ebuild (renamed from dev-db/opendbx/opendbx-1.4.6-r5.ebuild) | 46 |
3 files changed, 30 insertions, 18 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex 826e5e70dae5..2ff3320e8665 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest index c156adfe3e81..e6978d0e0023 100644 --- a/dev-db/opendbx/Manifest +++ b/dev-db/opendbx/Manifest @@ -1,5 +1,5 @@ AUX opendbx-doxy.patch 1557 BLAKE2B 260c5578e22a751f59308d9dc3f94017951f24775c5dc52d3e4e512380244e5d7266704aae43119267c1726a08c086658c7c0e89bbcb66f671507712d9e2c9ba SHA512 f98f1b1014a44713c1cc5adf46fba8af5333c97faf765e8d1e6c0eb4772650c7524f4c8a90cffe6bbdb4c688beb6bac3eb2755105164002f3e85797adb135004 AUX opendbx-man-optional.patch 1000 BLAKE2B a8e5dc4e0721b94acd0b379a6d27ea8e349e85ea31d362d4f6c0ac274220f69e09bcb4c0436b6cfd3037983e66d484cb48057cb740456d772ab49e7c4dade566 SHA512 1acf644bc84474e62d28cfa07a0030fd2ec919e27cb514cf710d4322f0f6c869e79bb11895e5eee549e4edb5e1924e708dc7ec87b02be722ce5306c418b6ecf8 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55 -EBUILD opendbx-1.4.6-r5.ebuild 2425 BLAKE2B 781a56db8841b8de991c90fed771562b4b13fbb3baf09cac4947a1bb67f450a4b63e9509beeb3ff3eddb4e1caaea8910aea0fd1c1801322f57da7f4d00f1f61b SHA512 540cf68cae95be043da81401ca63ba9e09289c154c20919878076de7eb94e5eb7ab1593b705f63c68155edb0b94f6ceae60e8c6e083893cef90e96c122535b25 +EBUILD opendbx-1.4.6-r6.ebuild 2575 BLAKE2B 691d03cf32321b5a8b280b5e3acd10c0116c662d1a8d483e9d0c803679f6613baa64b4bf38f6e687c255c376769311c7a9e6b8d40cf0e8ea451ba312fd532469 SHA512 b84063de45c99775d9766751b69b1c942b2b9630815641f9236bf9537433581bcc707c7a3fd0dc15dc4e75d1188287543cd7618d6a9d016b76450d61cdc9d942 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild index a84c00e4f96d..5a24ad4af48d 100644 --- a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild +++ b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit autotools flag-o-matic @@ -12,26 +12,35 @@ SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~arm64 x86" -IUSE="firebird +man +mysql oracle postgres sqlite" -RESTRICT="firebird? ( bindist )" +IUSE="firebird +man +mysql oracle postgres sqlite test" +# The test programs need manual/interactive use. +RESTRICT=" + firebird? ( bindist ) + !test? ( test ) + test +" +REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )" RDEPEND="mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )" -DEPEND="${RDEPEND} - man? ( app-doc/doxygen - app-text/docbook2X )" - -REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )" - -PATCHES=( "${FILESDIR}/${PN}-doxy.patch" - "${FILESDIR}/${PN}-man-optional.patch" ) +DEPEND="${RDEPEND}" +BDEPEND=" + man? ( + app-doc/doxygen + app-text/docbook2X + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-doxy.patch" + "${FILESDIR}/${PN}-man-optional.patch" +) pkg_setup() { - if use oracle && [[ ! -d ${ORACLE_HOME} ]] - then + if use oracle && [[ ! -d ${ORACLE_HOME} ]]; then die "Oracle support requested, but ORACLE_HOME not set to a valid directory!" fi } @@ -50,8 +59,8 @@ src_configure() { use postgres && backends="${backends} pgsql" use sqlite && backends="${backends} sqlite3" - use mysql && append-cppflags -I/usr/include/mysql - use firebird && append-cppflags -I/opt/firebird/include + use mysql && append-cppflags -I"${ESYSROOT}"/usr/include/mysql + use firebird && append-cppflags -I"${ESYSROOT}"/opt/firebird/include if use oracle ; then # Traditionally, OCI header files are provided in: @@ -71,7 +80,10 @@ src_configure() { # bug #788304 append-cxxflags -std=c++14 - econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)" + econf \ + --with-backends="${backends}" \ + --enable-manpages="$(usex man yes no)" \ + $(use_enable test) } src_compile() { |