| 1 |
commit: ac121538f7d68721ca7ee4159a6c3647ba8565ea |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 2 14:45:23 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 2 14:55:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac121538 |
| 7 |
|
| 8 |
app-cdr/cdw: Fix building against sys-libs/ncurses[tinfo] |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/672394 |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
app-cdr/cdw/cdw-0.8.0.ebuild | 25 ++++++++++++++++--------- |
| 15 |
app-cdr/cdw/cdw-9999.ebuild | 24 ++++++++++++++++-------- |
| 16 |
2 files changed, 32 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild |
| 19 |
index 2bcc1069a8b..5a20e7099a1 100644 |
| 20 |
--- a/app-cdr/cdw/cdw-0.8.0.ebuild |
| 21 |
+++ b/app-cdr/cdw/cdw-0.8.0.ebuild |
| 22 |
@@ -1,8 +1,8 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=5 |
| 28 |
-inherit eutils |
| 29 |
+EAPI=6 |
| 30 |
+inherit toolchain-funcs |
| 31 |
|
| 32 |
DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" |
| 33 |
HOMEPAGE="http://cdw.sourceforge.net" |
| 34 |
@@ -11,17 +11,24 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz" |
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="amd64 ~ppc x86" |
| 38 |
-IUSE="" |
| 39 |
|
| 40 |
-DEPEND="virtual/cdrtools |
| 41 |
+RDEPEND=" |
| 42 |
+ virtual/cdrtools |
| 43 |
app-cdr/dvd+rw-tools |
| 44 |
dev-libs/libburn |
| 45 |
dev-libs/libcdio[-minimal] |
| 46 |
- sys-libs/ncurses[unicode]" |
| 47 |
-RDEPEND=${DEPEND} |
| 48 |
+ sys-libs/ncurses[unicode] |
| 49 |
+" |
| 50 |
+DEPEND=" |
| 51 |
+ ${RDEPEND} |
| 52 |
+ virtual/pkgconfig |
| 53 |
+" |
| 54 |
+PATCHES=( |
| 55 |
+ "${FILESDIR}"/${P}-uclibc.patch |
| 56 |
+) |
| 57 |
|
| 58 |
-src_prepare() { |
| 59 |
- epatch "${FILESDIR}"/${P}-uclibc.patch |
| 60 |
+src_configure() { |
| 61 |
+ econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" |
| 62 |
} |
| 63 |
|
| 64 |
src_install() { |
| 65 |
|
| 66 |
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild |
| 67 |
index 68ab7c086d5..2072bb68651 100644 |
| 68 |
--- a/app-cdr/cdw/cdw-9999.ebuild |
| 69 |
+++ b/app-cdr/cdw/cdw-9999.ebuild |
| 70 |
@@ -1,12 +1,12 @@ |
| 71 |
-# Copyright 1999-2015 Gentoo Foundation |
| 72 |
+# Copyright 1999-2018 Gentoo Authors |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
-EAPI=5 |
| 76 |
+EAPI=6 |
| 77 |
ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw" |
| 78 |
ECVS_MODULE="cdw" |
| 79 |
ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}" |
| 80 |
|
| 81 |
-inherit autotools eutils cvs |
| 82 |
+inherit autotools cvs toolchain-funcs |
| 83 |
|
| 84 |
MY_P=${PN}_${PV} |
| 85 |
DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" |
| 86 |
@@ -15,21 +15,29 @@ HOMEPAGE="http://cdw.sourceforge.net" |
| 87 |
LICENSE="GPL-2" |
| 88 |
SLOT="0" |
| 89 |
KEYWORDS="" |
| 90 |
-IUSE="" |
| 91 |
|
| 92 |
-DEPEND="virtual/cdrtools |
| 93 |
+RDEPEND=" |
| 94 |
+ virtual/cdrtools |
| 95 |
app-cdr/dvd+rw-tools |
| 96 |
dev-libs/libburn |
| 97 |
dev-libs/libcdio[-minimal] |
| 98 |
- sys-libs/ncurses[unicode]" |
| 99 |
-RDEPEND=${DEPEND} |
| 100 |
- |
| 101 |
+ sys-libs/ncurses[unicode] |
| 102 |
+" |
| 103 |
+DEPEND=" |
| 104 |
+ ${RDEPEND} |
| 105 |
+ virtual/pkgconfig |
| 106 |
+" |
| 107 |
S=${WORKDIR}/${ECVS_MODULE} |
| 108 |
|
| 109 |
src_prepare() { |
| 110 |
+ default |
| 111 |
eautoreconf |
| 112 |
} |
| 113 |
|
| 114 |
+src_configure() { |
| 115 |
+ econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" |
| 116 |
+} |
| 117 |
+ |
| 118 |
src_install() { |
| 119 |
DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \ |
| 120 |
default |
Archives