From 841dd747e05360ff8feb1be133ec32930b5c8d71 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 11 Sep 2019 11:08:38 +0200
Subject: dev-libs/libcdio-paranoia: Make USE="-static-libs" do something

Thanks-to: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Closes: https://bugs.gentoo.org/694026
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 .../libcdio-paranoia-0.93_p1-r1.ebuild             | 73 ++++++++++++++++++++
 .../libcdio-paranoia-0.93_p1.ebuild                | 68 -------------------
 .../libcdio-paranoia-0.94_p2-r2.ebuild             | 78 ++++++++++++++++++++++
 .../libcdio-paranoia-0.94_p2.ebuild                | 73 --------------------
 .../libcdio-paranoia-2.0.0-r1.ebuild               | 70 +++++++++++++++++++
 .../libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild | 65 ------------------
 6 files changed, 221 insertions(+), 206 deletions(-)
 create mode 100644 dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
 delete mode 100644 dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
 create mode 100644 dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
 delete mode 100644 dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
 create mode 100644 dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
 delete mode 100644 dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild

(limited to 'dev-libs/libcdio-paranoia')

diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
new file mode 100644
index 000000000000..8accb92c97c0
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0"
+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="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.93[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
deleted file mode 100644
index d10701c912ca..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-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="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.93[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
new file mode 100644
index 000000000000..2c0a95a324b1
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0"
+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="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		# upstream accidentally default-disabled it
+		# reenable it to preserve ABI compat with previous versions
+		# https://bugs.gentoo.org/616054
+		# https://savannah.gnu.org/bugs/index.php?50978
+		--enable-ld-version-script
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
deleted file mode 100644
index 8ff3a41accbc..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-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="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		# upstream accidentally default-disabled it
-		# reenable it to preserve ABI compat with previous versions
-		# https://bugs.gentoo.org/616054
-		# https://savannah.gnu.org/bugs/index.php?50978
-		--enable-ld-version-script
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..f58323ff0b56
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0/2" # soname version
+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="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+src_prepare() {
+	default
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		#--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
deleted file mode 100644
index a4c7136bb411..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0/2" # soname version
-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="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-src_prepare() {
-	default
-	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		#--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
-- 
cgit v1.2.3