gentoo resync : 07.10.2018

3 files changed, 3 insertions, 53 deletions

diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index 10fb23294b0a..4e6c9ce9ee88 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,4 +1,3 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3-r1.ebuild 1245 BLAKE2B c45100b1cb46d197421f9964a22edcbb7a5f4d026348d6a8c436c30df1d4463e6ecf353458957f8b9e8f05bf2cccc13a1ae42e91359ce0471e351195d9884e58 SHA512 1fc07b8db7fa5e486171370a4f0577321ce3d7c39766dd1eca9678ac11671c6430416a14490129d32b2928aae619b057f3ac9847fce7e14af15a859568269521
-EBUILD cdcat-0.3.ebuild 1231 BLAKE2B 435ec1d0f9750158055c9ddf2ebc1a31fa0223d51d59b34832fd9bd8cef528244e3a9d645c0d20b9149d0b1b578a4c43ef495d61b31822e07a84336da09a19ce SHA512 a21844dbbc3ba3206407dd59e0af6bc520fb09d83a08fc3454853bcd2c44853e8f68d2ffed1819a034c6e22c6792f0ba7b4b35d91df62f75716429a82f5185fa
+EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B ac07365db2ca0d52437ea84268db936669044fa2d97502bcd79b1f86a9cade70b426c788430267609b4e7e28abaa84092e918a2142484ee1b923e4c1e521404c SHA512 c2e0c151bd9b306fdf6a10fa3c760fdbec1be83e83c92f8f54e67d811be0a396b4ed86d6daebf99640374e6d811c3c00744e5fab681f947fa5b085d81f1c4423
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index 3649b8e2eacc..8ad49a3e87e9 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://cdcatalog.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/cdrtools
 	!app-backup/cdbkup"
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
deleted file mode 100644
index 6f165bb146e3..000000000000
--- a/app-misc/cdcat/cdcat-0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="simple yet effective CD indexing program"
-# original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
-SRC_URI="mirror://sourceforge/cdcatalog/${P}.tar.gz"
-HOMEPAGE="http://cdcatalog.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/cdrtools
-	!app-backup/cdbkup"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# workaround install.sh ignoring --man_prefix
-	sed -i 's:^MAN_PREFIX:#:' install.sh
-
-	# fix path to cd index files to be FHS-compliant
-	sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl
-
-	# work around problem with isoinfo -di
-	sed -i 's:isoinfo -di:isoinfo -d -i:' src/cdcat.pl
-}
-
-src_install() {
-	# workaround install.sh ignoring --man_prefix
-	export MAN_PREFIX="${D}/usr/share/man"
-	dodir /usr/share/man/man1
-
-	# create index files path
-	dodir          /var/lib/cdcat
-	chgrp cdrom    "${D}"/var/lib/cdcat
-	chmod g+ws,o+w "${D}"/var/lib/cdcat
-
-	# now use the included install.sh
-	./install.sh --prefix="${D}/usr" \
-		--man_prefix="${D}/usr/share/man" || die "Install script failed."
-
-	insinto /etc
-	doins doc/cdcat.conf || die
-}