gentoo resync : 22.10.2018

4 files changed, 11 insertions, 74 deletions

diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
index ba561aecb952..6da817d622ac 100644
--- a/media-video/recordmydesktop/Manifest
+++ b/media-video/recordmydesktop/Manifest
@@ -1,6 +1,5 @@
-AUX 0.3.8.1-fix-libjack-check.patch 518 BLAKE2B b4486cf048577f7d8f527b977d3cd9812929e49c1aff857ddddbbf5c2df0974c9d134ec1387de8ae5e3410006351a6355a47d9996e351a62aa57614aaf66d950 SHA512 f726f82843f190a8d346b3d22709131da2767f4ad4199a6fe848d1339da3ef010b6c55563bb8dc71553003bd2f8246f16ba16a0899baf2fce3dc92ddb02db778
+AUX 0.3.8.1-fix-libjack-check.patch 506 BLAKE2B 690cd66747ca9065245ea041362ecf6aa03af8829d7cf373b73b46e236af0c076eadca1143419a49eb686b47d45c880c096468d6eb7afca38edb555c979dadf0 SHA512 5117f79f35fcaee8a438efd50c619ac2eb73b89402110215e35f61736f0fb4ba35209ef20b15e236c4685a8f0583cae767a6a2fef00a31d8f4936a196aa19a8b
 AUX 0.3.8.1-fix_new_theora.patch 2212 BLAKE2B 260643c7092e44fd040ee3f248f97969e4fc5be2d2b12946ab57b6412cded727676fd8426caacd0ad3e98b456f51a7173a66ebc9f8a95abce802ca65039199e9 SHA512 f504d9c889344be7f44a06b6125acf73fc32573256356afd99093af92ee3268267616b5956c0ada7a8484dcfb9f482ffa9c6c6d6f54b4080bc17a12cd2f21761
 DIST recordmydesktop-0.3.8.1.tar.gz 198732 BLAKE2B d28b8d61e340f100ea0954fef2861c4dd8ec2cdaef5a70b18d727d652579c85b901d35a056af7a81e49c98a602a9fb75ce0b5a302aab53ab735577b0159b95fa SHA512 a32df1257d7d8928123437b38abcbdf623a9a65d313df5bec9bc06ef7229ebe4664a3cbea1fe5f6f1f9b89efb939873adc020f4ac072477f6df9481a37e7c350
-EBUILD recordmydesktop-0.3.8.1-r4.ebuild 1214 BLAKE2B a87fd37e4ec96284509d3955762a59d1eb9aa664c43d0c767b8bd0e344a883d0facd973f800598b3a1861348efe90de80d62997fc3048be54174304123bfd68d SHA512 150babc27790593a51ce03bd446afacfcd9e872449294c85f4d2178edd448f416ebf2b642cf9953300e4fb5ae896d86b8691b74868e9593d1101ecdbea44421d
-EBUILD recordmydesktop-0.3.8.1-r5.ebuild 1204 BLAKE2B 0cb48f0de4f55ea85243ec283b3106890e09151306950ac1c38762bd741d74f6add3f91cdf79d6a77e165901f7f43207f0d6b189c0891009320dd4b2ea24c036 SHA512 ba18156c2bd8478278eee9e192345115ce6b5966713b67b7e84068fd4b7af38451b42fd8eb305a6f0ec292cee13c4eba7845bbf732b6e33f51beeb533aac6415
+EBUILD recordmydesktop-0.3.8.1-r6.ebuild 1078 BLAKE2B 3d0817d14acc56671252f27b05f75d60ea920e665e470ffeb82f71cc2210139870c39ac95a3e4b607bfb835eaf0159ae404025790c5e585c5258b254f748d7ef SHA512 c6c69eac2b4642866c359a93acca7269e6db238184384fb547f8079c72eb3b18c350b9215245fa3d86e4b3b50659dc6dc3cb20d7feb22ab8598a6aab17d0d9c3
 MISC metadata.xml 316 BLAKE2B 1742ad6dfbf9b34550898774321b339ebe6e6b5205650a9cf5f9ffb73b0e37ddccec560ccfc3657c8b21fd539367c3a14b7d6ecac87037a600290a16900f8856 SHA512 b2b2172a9a6fe5c1b1677138e045a24ec1922838e0ed7c2a958b41b73864c8a35f4dc6717468f0d2231763521b9b067d5123c930ec48c51789a7ea962629e1a8
diff --git a/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch b/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
index cb8a3b473484..ee23087c8104 100644
--- a/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
+++ b/media-video/recordmydesktop/files/0.3.8.1-fix-libjack-check.patch
@@ -1,5 +1,5 @@
---- trunk/recordmydesktop/configure.ac	2008/12/13 17:46:41	584
-+++ trunk/recordmydesktop/configure.ac	2009/01/10 11:35:06	587
+--- recordmydesktop/configure.ac	2008/12/13 17:46:41	584
++++ recordmydesktop/configure.ac	2009/01/10 11:35:06	587
 @@ -95,7 +95,10 @@
               AC_MSG_ERROR([Can't find libpthread]))
  
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
deleted file mode 100644
index fba38e965e18..000000000000
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils autotools
-
-DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
-HOMEPAGE="http://recordmydesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack"
-
-RDEPEND="sys-libs/zlib
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXdamage
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libtheora[encode]
-	x11-libs/libICE
-	x11-libs/libSM
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i \
-		-e 's:shmstr.h:shmproto.h:g' \
-		src/rmd_{getzpixmap.c,update_image.c} || die
-
-	# fix weird Framerates with new libtheora
-	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
-
-	# fix check for jack support
-	epatch "${FILESDIR}/${PV}-fix-libjack-check.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-dependency-tracking \
-		$(use_enable !alsa oss) \
-		$(use_enable jack)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README || die
-}
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r6.ebuild
index 4dedc005322c..940e02981cd0 100644
--- a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r5.ebuild
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
 HOMEPAGE="http://recordmydesktop.sourceforge.net/"
@@ -11,11 +11,10 @@ SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack"
 
-RDEPEND="sys-libs/zlib
-	x11-libs/libXext
+RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXdamage
 	media-libs/libvorbis
@@ -29,17 +28,16 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:shmstr.h:shmproto.h:g' \
 		src/rmd_{getzpixmap.c,update_image.c} || die
 
 	# fix weird Framerates with new libtheora
-	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
+	eapply "${FILESDIR}/${PV}-fix_new_theora.patch"
 
 	# fix check for jack support
-	epatch "${FILESDIR}/${PV}-fix-libjack-check.patch"
-
-	eapply_user
+	eapply "${FILESDIR}/${PV}-fix-libjack-check.patch"
 
 	eautoreconf
 }
@@ -50,8 +48,3 @@ src_configure() {
 		$(use_enable !alsa oss) \
 		$(use_enable jack)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README || die
-}