[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/

[Lars Wendler]

commit:     44c925eb8e7c575773810e21962e5af1b0023b69
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 11:48:57 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 15:25:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c925eb

dev-libs/libcdio: Removed old.

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libcdio/Manifest                          |  1 -
 dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch    | 37 ----------
 dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 16 -----
 dev-libs/libcdio/libcdio-1.0.0-r1.ebuild           | 78 ----------------------
 4 files changed, 132 deletions(-)

diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index b6c43e44160..9eee9442b7b 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,6 +1,5 @@
 DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91
 DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
-DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f

diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
deleted file mode 100644
index b3781d2a7e5..00000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky@×××.org>
-Date: Sat, 25 Nov 2017 14:03:37 -0500
-Subject: Fix breakage caused by unshadowing i_first_track
-
-Reported and patch by KO Myung-Hun
----
- src/cdda-player.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdda-player.c b/src/cdda-player.c
-index efeee19..333e1f5 100644
---- a/src/cdda-player.c
-+++ b/src/cdda-player.c
-@@ -531,8 +531,8 @@ static void
- get_cddb_disc_info(CdIo_t *p_cdio)
- {
- #ifdef HAVE_CDDB
--  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
--                   i_tracks, &i_cddb_matches);
-+  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
-+                   i_tracks_global, &i_cddb_matches);
-   if (b_db) {
-     int i_year;
-     i_year = atoi(year);
-@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track)
- {
- #ifdef HAVE_CDDB
-   cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
--                                        i_track - i_first_track);
-+                                        i_track - i_first_track_global);
-   if (t) {
-     cddb_track_set_title(t, title);
-     cddb_track_set_artist(t, artist);
--- 
-cgit v1.0-41-gc330
-

diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
deleted file mode 100644
index bdde131ffc8..00000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/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-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
deleted file mode 100644
index 039608e47da..00000000000
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/17" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cddb +cxx minimal static-libs test"
-
-RDEPEND="
-	!minimal? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		cddb? ( >=media-libs/libcddb-1.3.2 )
-	)
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/cdio/cdio_config.h
-	/usr/include/cdio/version.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-version.patch"
-	"${FILESDIR}/${P}-cddb.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	sed \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i configure || die
-
-	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
-}
-
-multilib_src_configure() {
-	local util_switch
-	if ! multilib_is_native_abi || use minimal ; then
-		util_switch="--without"
-	else
-		util_switch="--with"
-	fi
-
-	# Tests fail if ECONF_SOURCE is not relative
-	ECONF_SOURCE="../${P}" econf \
-		--disable-maintainer-mode \
-		$(use_enable cxx) \
-		--disable-cpp-progs \
-		--disable-example-progs \
-		$(use_enable static-libs static) \
-		$(use_enable cddb) \
-		--disable-vcd-info \
-		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}