From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6764B139083 for ; Fri, 24 Nov 2017 14:13:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8786BE0EA8; Fri, 24 Nov 2017 14:13:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63225E0EA8 for ; Fri, 24 Nov 2017 14:13:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7F4533C4EE for ; Fri, 24 Nov 2017 14:13:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B90FA601 for ; Fri, 24 Nov 2017 14:13:03 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1511532776.ba52139c96a39f6f2285edb173af960a2afb51fa.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libcdio/files/libcdio-1.0.0-version.patch dev-libs/libcdio/libcdio-1.0.0-r1.ebuild dev-libs/libcdio/libcdio-1.0.0.ebuild X-VCS-Directories: dev-libs/libcdio/ dev-libs/libcdio/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ba52139c96a39f6f2285edb173af960a2afb51fa X-VCS-Branch: master Date: Fri, 24 Nov 2017 14:13:03 +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: 15750fad-b0ab-4dbc-8f21-1b0a9db757c9 X-Archives-Hash: f687a309bd18efb4afd48a0b43bd861b commit: ba52139c96a39f6f2285edb173af960a2afb51fa Author: Lars Wendler gentoo org> AuthorDate: Fri Nov 24 14:12:39 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Nov 24 14:12:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba52139c 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 dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 16 ++++++++++++++++ .../{libcdio-1.0.0.ebuild => libcdio-1.0.0-r1.ebuild} | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) 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 00000000000..3c812a9407a --- /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 9d54cf3b873..5a278ab70ab 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