commit: 4926acf2ce736a3102587383553faf82560b16fe
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 15:04:51 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 15:04:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4926acf2
media-sound/ripperx: Port to EAPI 7
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/ripperx-2.7.3-ceilf-underlink.patch | 11 ++++++
.../ripperx/files/ripperx-2.7.3-ldflags.patch | 6 ++--
.../ripperx/files/ripperx-2.7.3-pkgconfig.patch | 4 +--
media-sound/ripperx/ripperx-2.7.3.ebuild | 41 ++++++++++------------
4 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
b/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
new file mode 100644
index 00000000000..56e40f13265
--- /dev/null
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ceilf-underlink.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -264,7 +264,7 @@
+ $(GTK_CFLAGS) \
+ -I$(includedir)
+
+-ripperX_LDADD = \
++ripperX_LDADD = -lm \
+ $(INTLLIBS) \
+ $(GTK_LIBS)
+
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
index 11e18972e63..e7e8a066b3b 100644
--- a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
@@ -1,11 +1,11 @@
---- plugins/Makefile.in
-+++ plugins/Makefile.in
+--- a/plugins/Makefile.in
++++ b/plugins/Makefile.in
@@ -658,7 +658,7 @@ uninstall-am: uninstall-binPROGRAMS
all: ripperX_plugin_tester $(PLUGINS)
.c.o:
- $(CC) $(CFLAGS) $(LDFLAGS) -c $< -o $@
-+ $(CC) $(CFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
index 48c24f4054a..d6a311a60b0 100644
--- a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
+++ b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
@@ -1,5 +1,5 @@
---- ripperX.pc.in
-+++ ripperX.pc.in
+--- a/ripperX.pc.in
++++ b/ripperX.pc.in
@@ -1,6 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
diff --git a/media-sound/ripperx/ripperx-2.7.3.ebuild
b/media-sound/ripperx/ripperx-2.7.3.ebuild
index 96bb4e62f35..2656cb3b070 100644
--- a/media-sound/ripperx/ripperx-2.7.3.ebuild
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -1,47 +1,44 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils
+EAPI=7
-MY_P=${P/x/X}
-MY_PN=${PN/x/X}
+inherit desktop
-DESCRIPTION="a GTK program to rip CD audio tracks and encode them to the Ogg,
MP3, or FLAC formats"
+DESCRIPTION="GTK program to rip CD audio tracks to Ogg, MP3 or FLAC"
HOMEPAGE="https://sourceforge.net/projects/ripperx";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P/x/X}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="nls"
-RDEPEND="media-libs/id3lib
+RDEPEND="
+ media-libs/id3lib
media-sound/cdparanoia
media-sound/lame
x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P/x/X}"
-src_prepare() {
- # AC_CHECK_LIB(m, ceilf, [], [MATH_LIB="-lm" MATH_LIB=""]) #401867
- sed -i -e '/ripperX_LDADD/s:=:= -lm:' src/Makefile.in || die
-
- epatch \
- "${FILESDIR}"/${P}-ldflags.patch \
- "${FILESDIR}"/${P}-pkgconfig.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-ceilf-underlink.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-pkgconfig.patch
+)
src_configure() {
econf $(use_enable nls)
}
src_install() {
- emake DESTDIR="${D}" install
- dodoc BUGS CHANGES FAQ README* TODO
- doicon src/xpms/${MY_PN}-icon.xpm
- make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}-icon
+ default
+
+ doicon src/xpms/ripperX-icon.xpm
+ make_desktop_entry ripperX ripperX ripperX-icon
}
