From: "NP Hardass" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/duc/
Date: Thu, 24 Mar 2016 12:13:33 +0000 (UTC) [thread overview]
Message-ID: <1458821608.09ee287ee9224cb67edc1afa7d5abff4fe791ad3.np-hardass@gentoo> (raw)
commit: 09ee287ee9224cb67edc1afa7d5abff4fe791ad3
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 12:12:33 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 12:13:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ee287e
sys-apps/duc: Fix configure phase, #577860
Package-Manager: portage-2.2.26
.../duc/{duc-1.4.1.ebuild => duc-1.4.1-r1.ebuild} | 19 ++++++++-----------
sys-apps/duc/duc-9999.ebuild | 19 ++++++++-----------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/sys-apps/duc/duc-1.4.1.ebuild b/sys-apps/duc/duc-1.4.1-r1.ebuild
similarity index 85%
rename from sys-apps/duc/duc-1.4.1.ebuild
rename to sys-apps/duc/duc-1.4.1-r1.ebuild
index 3c2974e..579a78b 100644
--- a/sys-apps/duc/duc-1.4.1.ebuild
+++ b/sys-apps/duc/duc-1.4.1-r1.ebuild
@@ -4,9 +4,7 @@
EAPI=5
-AUTOTOOLS_AUTORECONF="true"
-AUTOTOOLS_IN_SOURCE_BUILD="true"
-inherit autotools-utils
+inherit autotools
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
@@ -37,7 +35,7 @@ DEPEND="
x11-libs/libX11
x11-libs/pango[X]
)
- !X? ( virtual/opengl )
+ !X? ( >=media-libs/glfw-3.0 )
)
leveldb? ( dev-libs/leveldb )
ncurses? ( sys-libs/ncurses:= )
@@ -57,14 +55,13 @@ src_unpack() {
src_prepare() {
sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die
- autotools-utils_src_prepare
+ default
+
+ eautoreconf
}
src_configure() {
- local myconf=(
- --disable-static
- $(use_with ncurses ui)
- )
+ local myconf=( $(use_enable ncurses ui) )
if use tokyocabinet; then
myconf+=( --with-db-backend=tokyocabinet )
@@ -83,8 +80,8 @@ src_configure() {
myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) )
else
# No GUI
- myconf+=( $(use_enable cairo) )
+ myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl )
fi
- autotools-utils_src_configure
+ econf ${myconf[@]}
}
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index 3c2974e..579a78b 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -4,9 +4,7 @@
EAPI=5
-AUTOTOOLS_AUTORECONF="true"
-AUTOTOOLS_IN_SOURCE_BUILD="true"
-inherit autotools-utils
+inherit autotools
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
@@ -37,7 +35,7 @@ DEPEND="
x11-libs/libX11
x11-libs/pango[X]
)
- !X? ( virtual/opengl )
+ !X? ( >=media-libs/glfw-3.0 )
)
leveldb? ( dev-libs/leveldb )
ncurses? ( sys-libs/ncurses:= )
@@ -57,14 +55,13 @@ src_unpack() {
src_prepare() {
sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die
- autotools-utils_src_prepare
+ default
+
+ eautoreconf
}
src_configure() {
- local myconf=(
- --disable-static
- $(use_with ncurses ui)
- )
+ local myconf=( $(use_enable ncurses ui) )
if use tokyocabinet; then
myconf+=( --with-db-backend=tokyocabinet )
@@ -83,8 +80,8 @@ src_configure() {
myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) )
else
# No GUI
- myconf+=( $(use_enable cairo) )
+ myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl )
fi
- autotools-utils_src_configure
+ econf ${myconf[@]}
}
next reply other threads:[~2016-03-24 12:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 12:13 NP Hardass [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-01 11:51 [gentoo-commits] repo/gentoo:master commit in: sys-apps/duc/ Ulrich Müller
2023-11-19 10:19 Ulrich Müller
2023-11-19 10:19 Ulrich Müller
2021-06-03 19:15 Sam James
2021-02-15 0:32 Sam James
2020-01-12 11:14 David Seifert
2018-06-17 20:34 David Seifert
2018-02-25 16:03 Jeroen Roovers
2017-08-05 19:01 Amy Liffey
2016-03-19 19:05 NP Hardass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458821608.09ee287ee9224cb67edc1afa7d5abff4fe791ad3.np-hardass@gentoo \
--to=np-hardass@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox