From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9C3DD59CA5 for ; Thu, 24 Mar 2016 12:13:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C58B6E07B2; Thu, 24 Mar 2016 12:13:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43B5AE07B2 for ; Thu, 24 Mar 2016 12:13:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 889C8340C92 for ; Thu, 24 Mar 2016 12:13:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09D14852 for ; Thu, 24 Mar 2016 12:13:33 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1458821608.09ee287ee9224cb67edc1afa7d5abff4fe791ad3.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/duc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/duc/duc-1.4.1-r1.ebuild sys-apps/duc/duc-1.4.1.ebuild sys-apps/duc/duc-9999.ebuild X-VCS-Directories: sys-apps/duc/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 09ee287ee9224cb67edc1afa7d5abff4fe791ad3 X-VCS-Branch: master Date: Thu, 24 Mar 2016 12:13:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b786eed6-86ee-4a0a-b859-221fa1f06194 X-Archives-Hash: 4c19bad70caaa4b6cac43fd814a9e3a5 commit: 09ee287ee9224cb67edc1afa7d5abff4fe791ad3 Author: NP-Hardass gentoo org> AuthorDate: Thu Mar 24 12:12:33 2016 +0000 Commit: NP Hardass gentoo 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[@]} }