summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-11-24 15:12:39 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-11-24 15:12:56 +0100
commitba52139c96a39f6f2285edb173af960a2afb51fa (patch)
tree2225d97cf686aafae33ba2bd5f117c9476a76cf2 /dev-libs/libcdio
parentdev-util/uncrustify: version bump (diff)
downloadgentoo-ba52139c96a39f6f2285edb173af960a2afb51fa.tar.gz
gentoo-ba52139c96a39f6f2285edb173af960a2afb51fa.tar.bz2
gentoo-ba52139c96a39f6f2285edb173af960a2afb51fa.zip
dev-libs/libcdio: Revbump to fix LIBCDIO_VERSION_NUM breakage.
Bug: https://bugs.gentoo.org/638644 Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'dev-libs/libcdio')
-rw-r--r--dev-libs/libcdio/files/libcdio-1.0.0-version.patch16
-rw-r--r--dev-libs/libcdio/libcdio-1.0.0-r1.ebuild (renamed from dev-libs/libcdio/libcdio-1.0.0.ebuild)7
2 files changed, 22 insertions, 1 deletions
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
new file mode 100644
index 000000000000..3c812a9407a2
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
@@ -0,0 +1,16 @@
+--- libcdio-1.0.0/configure.ac
++++ libcdio-1.0.0/configure.ac
+@@ -32,7 +32,12 @@
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+ [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+
+-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++# Broken by design. See also
++# https://savannah.gnu.org/bugs/?52491
++# and
++# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
++#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++LIBCDIO_VERSION_NUM=10000
+ AC_SUBST(LIBCDIO_VERSION_NUM)
+
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/dev-libs/libcdio/libcdio-1.0.0.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index 9d54cf3b873b..5a278ab70abe 100644
--- a/dev-libs/libcdio/libcdio-1.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils libtool multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -33,8 +33,13 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/cdio/version.h
)
+PATCHES=( "${FILESDIR}/${P}-version.patch" )
+
src_prepare() {
default
+
+ eautoreconf
+
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die