gentoo resync : 16.01.2021

4 files changed, 29 insertions, 24 deletions

diff --git a/media-video/lxdvdrip/Manifest b/media-video/lxdvdrip/Manifest
index 405d67508146..c71b624f2e6f 100644
--- a/media-video/lxdvdrip/Manifest
+++ b/media-video/lxdvdrip/Manifest
@@ -1,5 +1,5 @@
-AUX lxdvdrip-1.77-makefile.patch 1341 BLAKE2B 8aaea5bfebfb0fa4cbb5be44d9c1e5204edad4c7e2200df848f44d304eeafd51de5f1b1fa258fb9d6dc90483f5cf459de4141a187f44bea5f06dc19d8daebda4 SHA512 4641e48fa2c7f35948788211a093f96506a74a5beee44b83787774627b52b85b36a65043e1b99cde6fb9352dde0a3838070e1f63a810f7f1433849be04e7e4a2
-AUX lxdvdrip-1.77-vamps-makefile.patch 389 BLAKE2B 52911721cd566f0fd648f698fd7fbc1f04cb1f21233924364369cc3e5a4feb9485f3fb550c9e81b43b742a922e18ade5dd886a1e05908d8f81bc432b4be90d0c SHA512 d51a411dd8bee365556b0ee275beccb99f00d4054e40080ca40fbb50f843a6646d2bb5fbc3ae97073dac7411706c0075266b00b7dfafcfa5977442143592e8b4
+AUX lxdvdrip-1.77-makefile.patch 1268 BLAKE2B f5bd7e75731ef372977684437bcb871ab405a5d14fd54f4e1bcc6a861c54dfd94ae4f2c4fd50e6fcd4bc120ed9fc351154a7fadefee615fd6c0457b25e8941ae SHA512 cb9903fe4921b1925cda6fe4d09725b1c0668a9c7f59cba603f0cb8e2a973e11ac8b67019fc4f9ea7ed36934d40d7c4bc0442d98b01d3acbef92742fd084ad42
+AUX lxdvdrip-1.77-vamps-makefile.patch 383 BLAKE2B bb9988a657d8573762b48822cd5a3386aa2da5b17f60b5257b478963f5f5a37eeb9e261f9d3eae585830ca27fdd7d66f8b4073790e0cae7209f3d5527ae81c39 SHA512 4ed8227ca7d25ab7c045f8307b2894b1b5ed903559c7a2436ba7ac3c1fe9a2153778320a0653cec955ce15a5a388b2aab87006b64f777f7d6488558c401ab295
 DIST lxdvdrip-1.77.tgz 714310 BLAKE2B 07ec19bc7ecd3c8dbe4be50b0f100f9e4ecd04cc09aedb6b0a24a0a1b3396e20628db611bb34ab1a53bbb32c887d34fe67c4002dbc220eb0802a28d1f1754a7b SHA512 d9b3003d52b90ad0f6c02054cb3171b4613b4210b5681c76f2e6e42d4a233438b1323c93b92457fd2e048e7ddef0df2089d82ea8bf3f9983c453ff99f122cca3
-EBUILD lxdvdrip-1.77.ebuild 1065 BLAKE2B aeb2c0a03153bfa1251ef695a7a9cca48f5b415d01c939032aa52c6c4983841f4fa281c1c5d7ebd5344cf3b110a5ed036d9f03b5754a9ad01cbeedefff967801 SHA512 e592f53c27cc3867ed61df6cb6a03ddbbe01fb66dec56c8cc1ee82b4c660568106f311c40f9ca3329b7e6ddc39ac518172ecf8023ab218e8118981d81f58d378
+EBUILD lxdvdrip-1.77-r1.ebuild 1003 BLAKE2B fdc4c49e79b5b3c1113e7b8a6920eb899a276938123ce96861ad6ceb2db6191513912751019ba70c9434bcefc4ca96e36281fcf99814af7d34f4b006894bc56d SHA512 34bcaf7858a98f0604a6aa89667f3a1ec5f9999d12e71ba267cfb95b3db67ec9e50fb17b3ac2850207d72d55e42ecad92c88ece9cc6afa1dc9fb95a708247d8b
 MISC metadata.xml 302 BLAKE2B 015155927bddbdf0da4bc053cf75a7f740e5fde1797d81ca2d852fae9e8c7fba173aab230f662040d9d3743355a80cf3e7225de454d4b506fd3e300fa9935ef2 SHA512 3abc4aa4ae66c40a1683ea378ca7149da05a6fef64334fc42b266d431cf9007f01304bc5730f14647be36d8031092c45e95d05e8c24e03cb9b51fc35a20d26ce
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
index 35df8fb65400..5d2684c07c88 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-03-17 15:40:30.886570544 -0600
-+++ Makefile	2014-03-17 15:41:22.729159468 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -3,31 +3,15 @@
  HINWEIS1 = 'Check the configuration file in /etc with the Changelog'
  HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
index 7c32d44ef371..325e4cb05068 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
@@ -1,6 +1,11 @@
---- vamps/Makefile.orig	2014-03-17 15:44:50.086513525 -0600
-+++ vamps/Makefile	2014-03-17 15:44:56.443321441 -0600
-@@ -21,7 +21,7 @@
+--- a/vamps/Makefile
++++ b/vamps/Makefile
+@@ -17,11 +17,11 @@
+ 
+ PREFIX    ?= /usr/local
+ 
+-CC         = gcc
++CC        ?= gcc
  CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
  	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
  CFLAGS    += -Wall
diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
index f925ac98c665..367fd0494709 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
-SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
 HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/libdvdread"
 RDEPEND="${DEPEND}
 	>=media-video/dvdauthor-0.6.9
 	media-video/streamdvd
-	media-video/mpgtx"
+	media-video/mpgtx
+"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-vamps-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-vamps-makefile.patch
+)
 
 src_compile() {
-	CC="$(tc-getCC)" emake
-	cd "${S}/vamps"
-	emake CC="$(tc-getCC)"
+	tc-export CC
+	emake
+	emake -C vamps
 }
 
 src_install() {
@@ -45,6 +45,6 @@ src_install() {
 	insinto /etc
 	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
 
-	cd "${S}/vamps"
+	cd vamps || die
 	emake PREFIX="${D}/usr" install
 }