[gentoo-commits] repo/proj/guru:dev commit in: app-misc/apidb/

[Andrew Ammerlaan]

commit:     26f96868fc4a5e0010d744d776d9f1f47368aba8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue May  5 09:45:48 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue May  5 09:45:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=26f96868

app-misc/apidb: simplify ebuild

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 app-misc/apidb/apidb-4.3.0_beta.ebuild | 46 +++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/app-misc/apidb/apidb-4.3.0_beta.ebuild 
b/app-misc/apidb/apidb-4.3.0_beta.ebuild
index fc6b572..8abffac 100644
--- a/app-misc/apidb/apidb-4.3.0_beta.ebuild
+++ b/app-misc/apidb/apidb-4.3.0_beta.ebuild
@@ -2,36 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+
+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/apidb/archive/4.3.0-beta.2.tar.gz";
+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"
+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
+"
 
-src_unpack() {
-       unpack ${A}
-       ln -s apidb-4.3.0-beta.2 $P
-       ls
-}
-src_prepare(){
+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-utils_src_prepare
+
+       cmake_src_prepare
 }
+
 src_configure() {
-local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug -DAPIDB_VERSION_STAGE=betarelease 
-DAPIDB_MARIADB=Y -Wno-dev)
-cmake-utils_src_configure
-}
-src_compile(){
-cmake-utils_src_compile
-}
-src_install(){
-cmake-utils_src_install
+       local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug 
-DAPIDB_VERSION_STAGE=betarelease -DAPIDB_MARIADB=Y -Wno-dev)
+       cmake_src_configure
 }