1 |
commit: ba52139c96a39f6f2285edb173af960a2afb51fa |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 24 14:12:39 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 24 14:12:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba52139c |
7 |
|
8 |
dev-libs/libcdio: Revbump to fix LIBCDIO_VERSION_NUM breakage. |
9 |
|
10 |
Bug: https://bugs.gentoo.org/638644 |
11 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
12 |
|
13 |
dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 16 ++++++++++++++++ |
14 |
.../{libcdio-1.0.0.ebuild => libcdio-1.0.0-r1.ebuild} | 7 ++++++- |
15 |
2 files changed, 22 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..3c812a9407a |
20 |
--- /dev/null |
21 |
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch |
22 |
@@ -0,0 +1,16 @@ |
23 |
+--- libcdio-1.0.0/configure.ac |
24 |
++++ libcdio-1.0.0/configure.ac |
25 |
+@@ -32,7 +32,12 @@ |
26 |
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], |
27 |
+ [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) |
28 |
+ |
29 |
+-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z` |
30 |
++# Broken by design. See also |
31 |
++# https://savannah.gnu.org/bugs/?52491 |
32 |
++# and |
33 |
++# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4 |
34 |
++#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z` |
35 |
++LIBCDIO_VERSION_NUM=10000 |
36 |
+ AC_SUBST(LIBCDIO_VERSION_NUM) |
37 |
+ |
38 |
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) |
39 |
|
40 |
diff --git a/dev-libs/libcdio/libcdio-1.0.0.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild |
41 |
similarity index 94% |
42 |
rename from dev-libs/libcdio/libcdio-1.0.0.ebuild |
43 |
rename to dev-libs/libcdio/libcdio-1.0.0-r1.ebuild |
44 |
index 9d54cf3b873..5a278ab70ab 100644 |
45 |
--- a/dev-libs/libcdio/libcdio-1.0.0.ebuild |
46 |
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild |
47 |
@@ -2,7 +2,7 @@ |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
|
50 |
EAPI=6 |
51 |
-inherit eutils libtool multilib-minimal |
52 |
+inherit autotools libtool multilib-minimal |
53 |
|
54 |
DESCRIPTION="A library to encapsulate CD-ROM reading and control" |
55 |
HOMEPAGE="https://www.gnu.org/software/libcdio/" |
56 |
@@ -33,8 +33,13 @@ MULTILIB_WRAPPED_HEADERS=( |
57 |
/usr/include/cdio/version.h |
58 |
) |
59 |
|
60 |
+PATCHES=( "${FILESDIR}/${P}-version.patch" ) |
61 |
+ |
62 |
src_prepare() { |
63 |
default |
64 |
+ |
65 |
+ eautoreconf |
66 |
+ |
67 |
sed \ |
68 |
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ |
69 |
-i configure || die |