Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/apidb/
Date: Tue, 05 May 2020 09:46:10
Message-Id: 1588671948.26f96868fc4a5e0010d744d776d9f1f47368aba8.andrewammerlaan@gentoo
1 commit: 26f96868fc4a5e0010d744d776d9f1f47368aba8
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
3 AuthorDate: Tue May 5 09:45:48 2020 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Tue May 5 09:45:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=26f96868
7
8 app-misc/apidb: simplify ebuild
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
12
13 app-misc/apidb/apidb-4.3.0_beta.ebuild | 46 +++++++++++++++++++++-------------
14 1 file changed, 28 insertions(+), 18 deletions(-)
15
16 diff --git a/app-misc/apidb/apidb-4.3.0_beta.ebuild b/app-misc/apidb/apidb-4.3.0_beta.ebuild
17 index fc6b572..8abffac 100644
18 --- a/app-misc/apidb/apidb-4.3.0_beta.ebuild
19 +++ b/app-misc/apidb/apidb-4.3.0_beta.ebuild
20 @@ -2,36 +2,46 @@
21 # Distributed under the terms of the GNU General Public License v2
22
23 EAPI=7
24 -inherit cmake-utils
25 +
26 +inherit cmake
27 +
28 +MYPV="${PV/_beta/-beta.2}"
29 +
30 DESCRIPTION="API Generator for Database acces."
31 HOMEPAGE="https://github.com/azaeldevel/apidb"
32 -SRC_URI="https://github.com/azaeldevel/apidb/archive/4.3.0-beta.2.tar.gz"
33 +SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
34 +
35 LICENSE="GPL-3"
36 SLOT="0"
37 KEYWORDS="~amd64"
38 +
39 IUSE=""
40 +
41 DEPEND=""
42 RDEPEND="${DEPEND}"
43 -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"
44 +BDEPEND="
45 + dev-libs/libxml2
46 + dev-libs/boost
47 + sys-devel/bison
48 + sys-devel/flex
49 + x11-libs/gtk+
50 + dev-libs/libtar
51 + dev-db/mariadb
52 + dev-libs/octetos-db-maria
53 + media-gfx/imagemagick
54 +"
55
56 -src_unpack() {
57 - unpack ${A}
58 - ln -s apidb-4.3.0-beta.2 $P
59 - ls
60 -}
61 -src_prepare(){
62 +S="${WORKDIR}/${PN}-${MYPV}"
63 +
64 +src_prepare() {
65 sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
66 #sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt || die
67 sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt || die
68 -cmake-utils_src_prepare
69 +
70 + cmake_src_prepare
71 }
72 +
73 src_configure() {
74 -local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug -DAPIDB_VERSION_STAGE=betarelease -DAPIDB_MARIADB=Y -Wno-dev)
75 -cmake-utils_src_configure
76 -}
77 -src_compile(){
78 -cmake-utils_src_compile
79 -}
80 -src_install(){
81 -cmake-utils_src_install
82 + local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug -DAPIDB_VERSION_STAGE=betarelease -DAPIDB_MARIADB=Y -Wno-dev)
83 + cmake_src_configure
84 }