mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
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
This commit is contained in:
committed by
Patrice Clement
parent
ff29e09044
commit
465ccfbc65
@@ -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])])
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user