commit: 465ccfbc65cb84e0a131262f79e1443a8cb7c881
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Wed Mar 28 04:48:52 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 22:47:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465ccfbc
dev-libs/libcdio: remove emul-linux-x86 references.
Also removed eutils/ltprune and bumped EAPI to 6, replaced prune_libtool_files
with a find -delete
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 4 ++--
dev-libs/libcdio/libcdio-0.93.ebuild | 17 +++++++++++------
dev-libs/libcdio/libcdio-0.94-r1.ebuild | 14 +++++++++-----
dev-libs/libcdio/libcdio-1.0.0-r1.ebuild | 4 ++--
dev-libs/libcdio/libcdio-1.1.0.ebuild | 5 +++--
dev-libs/libcdio/libcdio-2.0.0.ebuild | 4 ++--
6 files changed, 29 insertions(+), 19 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
index 3c812a9407a..bdde131ffc8 100644
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
@@ -1,5 +1,5 @@
---- libcdio-1.0.0/configure.ac
-+++ libcdio-1.0.0/configure.ac
+--- 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])])
diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild
b/dev-libs/libcdio/libcdio-0.93.ebuild
index 7272a7dbdef..cf8534c7750 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils libtool multilib-minimal
+EAPI=6
+
+inherit libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/";
@@ -19,13 +20,15 @@ RDEPEND="
cddb? ( >=media-libs/libcddb-1.3.2 )
)
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+"
+
DEPEND="${RDEPEND}
sys-apps/sed
sys-devel/gettext
virtual/pkgconfig
- test? ( dev-lang/perl )"
+ test? ( dev-lang/perl )
+"
+
DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
MULTILIB_WRAPPED_HEADERS=(
@@ -34,6 +37,8 @@ MULTILIB_WRAPPED_HEADERS=(
)
src_prepare() {
+ default
+
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die
@@ -63,5 +68,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
index 7f63c92ba24..1a21ff3a2f4 100644
--- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils libtool multilib-minimal
+
+inherit libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/";
@@ -19,13 +20,15 @@ RDEPEND="
cddb? ( >=media-libs/libcddb-1.3.2 )
)
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+"
+
DEPEND="${RDEPEND}
sys-apps/sed
sys-devel/gettext
virtual/pkgconfig
- test? ( dev-lang/perl )"
+ test? ( dev-lang/perl )
+"
+
DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
MULTILIB_WRAPPED_HEADERS=(
@@ -35,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
src_prepare() {
default
+
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die
@@ -64,5 +68,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index c4bdf2c7bd9..039608e47da 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/";
@@ -74,5 +74,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild
b/dev-libs/libcdio/libcdio-1.1.0.ebuild
index 1342280b6ce..e41ff785813 100644
--- a/dev-libs/libcdio/libcdio-1.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/";
@@ -21,6 +21,7 @@ RDEPEND="
)
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
"
+
DEPEND="${RDEPEND}
sys-apps/sed
sys-devel/gettext
@@ -69,5 +70,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild
b/dev-libs/libcdio/libcdio-2.0.0.ebuild
index f50f17d50c9..8c41fd9ef9d 100644
--- a/dev-libs/libcdio/libcdio-2.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/";
@@ -69,5 +69,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
