commit:     a1742cba4dd270adc849fa63c4f3666dfe6a679b
Author:     Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Sun May 16 16:24:46 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun May 16 16:24:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1742cba

app-misc/apidb: fix deps, drop old

Closes: https://bugs.gentoo.org/785628
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>

 app-misc/apidb/Manifest                   |  5 ---
 app-misc/apidb/apidb-4.3.0_beta.ebuild    | 47 --------------------
 app-misc/apidb/apidb-5.0.0_alpha.ebuild   | 56 -----------------------
 app-misc/apidb/apidb-5.0.0_alpha19.ebuild | 73 ------------------------------
 app-misc/apidb/apidb-5.0.0_alpha20.ebuild | 74 -------------------------------
 app-misc/apidb/apidb-5.0.0_alpha8.ebuild  | 73 ------------------------------
 app-misc/apidb/apidb-5.8.0_beta.ebuild    | 14 +++---
 7 files changed, 8 insertions(+), 334 deletions(-)

diff --git a/app-misc/apidb/Manifest b/app-misc/apidb/Manifest
index a972c589b..d6fe2f42c 100644
--- a/app-misc/apidb/Manifest
+++ b/app-misc/apidb/Manifest
@@ -1,6 +1 @@
-DIST 4.3.0-beta.2.tar.gz 168416 BLAKE2B 
a3c6e948d0227c6bfc1e030111c0c31fe89ebc294f283246f3446d611ae4d4353534c9270dac40fb46b9189d8ea42ab0f10c2e2d783af8499442c207bd76e3dd
 SHA512 
efc0733ea683a47a2e10e97a53ea6ed378aa152b191d7689529a9acfe0866c7aefec2987b9094c4874c4966ae5869a133a5b194de8e99af338282ff30f2586ad
-DIST 5.0.0-alpha.2.tar.gz 165464 BLAKE2B 
92975743b28dbed779c9d3c86cb9636b321f18268e830e97fcd80f54f67bb29a70b1d8f5bd509b5f6c86f982b48d31b861aad5f1981f4304ad43eda254620283
 SHA512 
d184cc782494e655f154cd23486a3bf4385b07c0ce95032b940c614cb16cb575ffecdceab3e71e7d90cb198b68867b06666da65db0981e5b87c4ab7c703fa794
-DIST 5.0.0-alpha19.tar.gz 160561 BLAKE2B 
52479e68742f62b8c98d9c9a31a261f6c887966bdf3e1820e3109af5a8164ba8294e4aecf806afb182a05750a6a548d855a492ee277051c494ef8897e2de3e73
 SHA512 
7008857aa20365d8b9f0c05a5e021e4071ae9af7c9208a4d33840b8e5118e5e1404cd005ec05a5a0d64bb3690d009a2f60af648dadc2bd14d806b6776828724b
-DIST 5.0.0-alpha20.tar.gz 160582 BLAKE2B 
cc50f784b67f0ab1564f4ea596864e65fa5c87f3729befd9a53ecf200f11f97ced901207bfd5313b814bc5b2d5df35ab62102606974e2b4f52e2bf80a09f9c9d
 SHA512 
465f2938f4fe9d1f557bc5c81e0639259a0aecda3949e18055a08f56a0294400e14a9a5e7865f4b46305343aca2ce1d283b963e6b15b2acffcc9a5758b494a15
-DIST 5.0.0-alpha8.tar.gz 165674 BLAKE2B 
10227665ddf1c2b17cacb4b52a4fb0ef06125066546cfc5ce919e2ce6bcba27dabdb471edee4a405f05208333fd6e719981d90384194dc6fab62791abc2eb671
 SHA512 
e1ef0a916b64ba116efad641b64446656a1e57c0e1c0d65cceafb59ec04deb142de1a11e625c4e8c214b36dcbf9adb4d413283d7a22f0a090098cebfc021e182
 DIST 5.8.0-beta.tar.gz 183120 BLAKE2B 
82d6a2e40aab046b14c6256acca458765bc744144f57d8aeae5201f8e89d97c70d5dbc42fe89880ded8ea9ee9ff96e2f2a91f3da8e7b13fb52cd4ba75caedaf6
 SHA512 
07d9cb217922239ad79ec6632d28f87d986e69ec3fd5c5440dbae96514a10a66f043efa84031c6541c3b1dc8b6786b5265c9cdd98f8b4102c3e937934bad649a

diff --git a/app-misc/apidb/apidb-4.3.0_beta.ebuild 
b/app-misc/apidb/apidb-4.3.0_beta.ebuild
deleted file mode 100644
index 8abffacb2..000000000
--- a/app-misc/apidb/apidb-4.3.0_beta.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MYPV="${PV/_beta/-beta.2}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb";
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-       dev-libs/libxml2
-       dev-libs/boost
-       sys-devel/bison
-       sys-devel/flex
-       x11-libs/gtk+
-       dev-libs/libtar
-       dev-db/mariadb
-       dev-libs/octetos-db-maria
-       media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-       sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-       #sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-
-       cmake_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug 
-DAPIDB_VERSION_STAGE=betarelease -DAPIDB_MARIADB=Y -Wno-dev)
-       cmake_src_configure
-}

diff --git a/app-misc/apidb/apidb-5.0.0_alpha.ebuild 
b/app-misc/apidb/apidb-5.0.0_alpha.ebuild
deleted file mode 100644
index c532b3c73..000000000
--- a/app-misc/apidb/apidb-5.0.0_alpha.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MYPV="${PV/_alpha/-alpha}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb";
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.2.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+mariadb postgresql"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-       dev-libs/libxml2
-       dev-libs/boost
-       sys-devel/bison
-       sys-devel/flex
-       x11-libs/gtk+
-       dev-libs/libtar
-       mariadb? ( dev-libs/octetos-db-maria )
-       postgresql? ( dev-libs/octetos-db-postgresql )
-       media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}.2"
-
-src_prepare() {
-       sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-       #sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || 
die
-
-       cmake_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=Gentoo 
-DCOMPONENT=FULL)
-       if use mariadb ;then
-               mycmakeargs+=(-DAPIDB_MARIADB=Y)
-       fi
-       if use postgresql ;then
-               mycmakeargs+=(-DAPIDB_POSTGRESQL=Y)
-       fi
-       cmake_src_configure
-}

diff --git a/app-misc/apidb/apidb-5.0.0_alpha19.ebuild 
b/app-misc/apidb/apidb-5.0.0_alpha19.ebuild
deleted file mode 100644
index cc4036ba4..000000000
--- a/app-misc/apidb/apidb-5.0.0_alpha19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_BINARY=cmake
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake
-
-MYPV="${PV/_alpha19/-alpha19}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb";
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+mariadb postgresql commands gtk +corelibs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-       dev-libs/libxml2
-       dev-libs/boost
-       sys-devel/bison
-       sys-devel/flex
-       gtk? ( x11-libs/gtk+ )
-       dev-libs/libtar
-       mariadb? ( dev-libs/octetos-db-maria )
-       postgresql? ( dev-libs/octetos-db-postgresql )
-       media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-       sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-       sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || 
die
-
-       cmake_src_prepare
-}
-
-src_configure() {
-       APIDBBUILD="CORE"
-       APIDBINSTALL=""
-       if use corelibs ;then
-               APIDBINSTALL="CORE"
-       fi
-       if use mariadb ;then
-               APIDBBUILD="$APIDBBUILD;MARIADB"
-               APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-       fi
-       if use postgresql ;then
-               APIDBBUILD="$APIDBBUILD;POSTGRESQL"
-               APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-       fi
-       if use commands ;then
-               APIDBINSTALL="$APIDBINSTALL;COMMANDS"
-       fi
-       if use gtk ;then
-               APIDBINSTALL="$APIDBINSTALL;GTK3"
-       fi
-       local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO 
-DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
-       cmake_src_configure
-}

diff --git a/app-misc/apidb/apidb-5.0.0_alpha20.ebuild 
b/app-misc/apidb/apidb-5.0.0_alpha20.ebuild
deleted file mode 100644
index b5a66447c..000000000
--- a/app-misc/apidb/apidb-5.0.0_alpha20.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_BINARY=cmake
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake
-
-MYPV="${PV/_alpha20/-alpha20}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb";
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+mariadb postgresql commands gtk +corelibs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-       dev-libs/libxml2
-       dev-libs/boost
-       dev-libs/octetos-coreutils
-       sys-devel/bison
-       sys-devel/flex
-       gtk? ( x11-libs/gtk+ )
-       dev-libs/libtar
-       mariadb? ( dev-libs/octetos-db-maria )
-       postgresql? ( dev-libs/octetos-db-postgresql )
-       media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-       sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-       sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || 
die
-
-       cmake_src_prepare
-}
-
-src_configure() {
-       APIDBBUILD="CORE"
-       APIDBINSTALL=""
-       if use corelibs ;then
-               APIDBINSTALL="CORE"
-       fi
-       if use mariadb ;then
-               APIDBBUILD="$APIDBBUILD;MARIADB"
-               APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-       fi
-       if use postgresql ;then
-               APIDBBUILD="$APIDBBUILD;POSTGRESQL"
-               APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-       fi
-       if use commands ;then
-               APIDBINSTALL="$APIDBINSTALL;COMMANDS"
-       fi
-       if use gtk ;then
-               APIDBINSTALL="$APIDBINSTALL;GTK3"
-       fi
-       local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO 
-DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
-       cmake_src_configure
-}

diff --git a/app-misc/apidb/apidb-5.0.0_alpha8.ebuild 
b/app-misc/apidb/apidb-5.0.0_alpha8.ebuild
deleted file mode 100644
index eb22524ec..000000000
--- a/app-misc/apidb/apidb-5.0.0_alpha8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_BINARY=cmake
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake
-
-MYPV="${PV/_alpha8/-alpha8}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb";
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="mariadb postgresql commands gui corelibs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-       dev-libs/libxml2
-       dev-libs/boost
-       sys-devel/bison
-       sys-devel/flex
-       gui? ( x11-libs/gtk+ )
-       dev-libs/libtar
-       mariadb? ( dev-libs/octetos-db-maria )
-       postgresql? ( dev-libs/octetos-db-postgresql )
-       media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-       sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-       sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-       sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || 
die
-
-       cmake_src_prepare
-}
-
-src_configure() {
-       APIDBBUILD="CORE"
-       APIDBINSTALL=""
-       if use corelibs ;then
-               APIDBINSTALL="CORE"
-       fi
-       if use mariadb ;then
-               APIDBBUILD="$APIDBBUILD;MARIADB"
-               APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-       fi
-       if use postgresql ;then
-               APIDBBUILD="$APIDBBUILD;POSTGRESQL"
-               APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-       fi
-       if use commands ;then
-               APIDBINSTALL="$APIDBINSTALL;COMMANDS"
-       fi
-       if use gui ;then
-               APIDBINSTALL="$APIDBINSTALL;GUI"
-       fi
-       local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=GENTOO 
-DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
-       cmake_src_configure
-}

diff --git a/app-misc/apidb/apidb-5.8.0_beta.ebuild 
b/app-misc/apidb/apidb-5.8.0_beta.ebuild
index a865134d4..6b25c2a22 100644
--- a/app-misc/apidb/apidb-5.8.0_beta.ebuild
+++ b/app-misc/apidb/apidb-5.8.0_beta.ebuild
@@ -13,7 +13,7 @@ MYPV="${PV/_beta/-beta}"
 MYPN="${PN}"
 MYP="${MYPN}-${MYPV}"
 
-DESCRIPTION="API Generator for Database acces."
+DESCRIPTION="API Generator for Database access"
 HOMEPAGE="https://github.com/azaeldevel/apidb";
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz";
 
@@ -23,20 +23,22 @@ KEYWORDS="~amd64"
 
 IUSE="+mariadb postgresql commands gtk +corelibs"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
+
+RDEPEND="
        dev-libs/libxml2
        dev-libs/boost
        dev-libs/octetos-coreutils
-       sys-devel/bison
-       sys-devel/flex
+       dev-libs/octetos-db-abstract
        gtk? ( x11-libs/gtk+ )
        dev-libs/libtar
        mariadb? ( dev-libs/octetos-db-maria )
        postgresql? ( dev-libs/octetos-db-postgresql )
        media-gfx/imagemagick
 "
+DEPEND="${RDEPEND}
+       sys-devel/bison
+       sys-devel/flex
+"
 
 S="${WORKDIR}/${PN}-${MYPV}"
 

Reply via email to