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

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 (file)
index 0000000..3c812a9
--- /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
similarity index 94%
rename from dev-libs/libcdio/libcdio-1.0.0.ebuild
rename to dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index 9d54cf3b873b8f350009c111ef405357cebafa25..5a278ab70abe4731599bb83a2179488be8d1b568 100644 (file)
--- 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