gentoo resync : 25.11.2020

5 files changed, 39 insertions, 30 deletions

diff --git a/media-sound/ripperx/Manifest b/media-sound/ripperx/Manifest
index 35c845c39540..ec7e31795961 100644
--- a/media-sound/ripperx/Manifest
+++ b/media-sound/ripperx/Manifest
@@ -1,5 +1,6 @@
-AUX ripperx-2.7.3-ldflags.patch 360 BLAKE2B 9fd12e89687879502a8cc8f10035ce3a1041eb1761ab32b67031ca6f64de22bb169a07464632b526e336d6787b88e5de933079251b2e35d452897f8182f72a69 SHA512 f430e043284f4d35f88b3fc8349fd4cfe9df87f6f1ec11cd52b97c25e853b9394a87066a54612f828987023dcfe4724cb31fd39c91c319d76b2f3209aa6546c4
-AUX ripperx-2.7.3-pkgconfig.patch 210 BLAKE2B 188ec668dd55bc711a43569e8c9a805df87c736054e1ecbdf256f26420cfffcc24cd102b8723050cf8512fc881c3942822f772d6c7ac69a8d6afed65a55aaf64 SHA512 87382681d64c65e9353940d3e0c8955f5f7113b9dd23d58c06034ccfb13ac4369577e3ad1cc325bd44e2b38f453ae82870198c45af6335fab7fe0c70993ac276
+AUX ripperx-2.7.3-ceilf-underlink.patch 176 BLAKE2B 99181a760fb5d9656780a450ae4518c9e5b953c4e40cf441d885af0945a1ea2955aaafeac1f44fa0501c6564d8761b7fa79b4190293d8c2e1af4255874176e8c SHA512 f82ef9f0f04653059b70cb1ba3836108603ace739331dcb0db4131fe2f3c05de16b4efa0428b0bc05a3336d7be288a7182aa3ca6dd05a5c162c3bca9fbc48cdf
+AUX ripperx-2.7.3-ldflags.patch 376 BLAKE2B 7b650dcebad5ea0beafdf4d7c454b399beed50e35239c2a9fc184b8de3b6f0fbf1d78a8d4ee91bca258fd1aeb68aeac445e57b097934aaec7c4962f1de245d69 SHA512 efd180beb0755f67cc7c1b24f9b4e44e7af3e417f74ee90b7323db9421f4a27f14a9a4662846f5abba2c5291bdc2c9b65e9f2644943319f33f15525d0b3571c5
+AUX ripperx-2.7.3-pkgconfig.patch 214 BLAKE2B 5d823a71886332b93fa186b92f8a5a3a50a733c51654b441749a109956532c775a482df189e39f9443417d6ccbea9fa6e791fada69c573a1a2a955e8dd2302fa SHA512 f373e3343e013e7af95e3069ecda12e0fc5a0348684ee1baffeede445a3d1f4702e5a318844af81f97113f93c532332edc428fc953195ed47cb18a3dbd4c3c72
 DIST ripperX-2.7.3.tar.gz 536059 BLAKE2B 2aab1e79d066333eefbc830202da1d5aa1f7924569aa8a6659265d193df3a6473e9091ea0087e3d69302f330274787068a02e71708c4df4c2cbebb1bea56f790 SHA512 fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea
-EBUILD ripperx-2.7.3.ebuild 1058 BLAKE2B 80d2dfbb3d75b8da59dc5e232c4b630a9bc4864ec94c2345aecd8ae4f074d490508af6aef2787084d4f1dde0407e640d4a412ac4da5f372652a7f2d77dff7b4b SHA512 b0b324da5b629c17b46d6332f52437751a50736f5a1b274a2f8f0863c7b01772527bc3a334a1ae0e44b0bc31d80520840739e9dd2a607e3fdc8a51bd0ae70969
+EBUILD ripperx-2.7.3.ebuild 842 BLAKE2B 656eae2576a520c41d239873123b4f6402b53d4331246d84f04bd6f67319b85e262c4bcab3b999afba38f8de9d5501a46f7ab3c41ceef8bafcd39430660c6828 SHA512 73f0003ba6c68f96e803f42b0cbe2ee6a7342ddaeea6de36473cd9131e3d16dcd33f54e7a4ac18935fbd68b310e9d96e0ccd43ec54e03dea2333a121e416d9a8
 MISC metadata.xml 340 BLAKE2B b5581bbcc58715541149c30a4762596dc3dd9e99c93e2c3308fff69438d0e4a4f4597a40ca05efe84512714b2eae35a2a93a55fdcb486663b9c6bad026d111f9 SHA512 0e9310c5b4c10d5a2663b6da6d247e5f992011c11c6c49a679c72b34e110a10509f40382fcdb1ae21ff529a1b8756820be197fbc0e4d64f30f1ce47430ae81d8
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 000000000000..56e40f132658
--- /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 11e18972e638..e7e8a066b3b7 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 48c24f4054a9..d6a311a60b05 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 96bb4e62f35e..2656cb3b070a 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
 }