gentoo resync : 02.04.2018

3 files changed, 2 insertions, 72 deletions

diff --git a/net-nntp/xrn/Manifest b/net-nntp/xrn/Manifest
index e9080dc425c7..6dcddddafd02 100644
--- a/net-nntp/xrn/Manifest
+++ b/net-nntp/xrn/Manifest
@@ -1,4 +1,3 @@
 DIST xrn-9.02.tgz 362615 BLAKE2B 710a378a8265a39e5910fbca7ea4778a7fb5282b6529664f7c49bf6d37b8c78535fadfd8eedbbd5150b29c4325e9eb94704adc57e0e3c9be9df749472f5a0d10 SHA512 ea8271b58b374889249686b75926a12ee474a5ed623f4db106bc885a212c8381102d128cc7ebffd12256633a809deb8a66382bea69692c9ba71ccecd481dce2a
-EBUILD xrn-9.02-r1.ebuild 1479 BLAKE2B e90fec97df3da9caef5fe822a02b141c388dca5ee1db55d2c4c3365a25b27d831a5a5fc269614a06ecc7926491cc34eb18f1b350c165833eebc570b551677775 SHA512 12c15a0ec9a677bf3b8a25de96975b004d0255652abe4dea2b041f362de2270a9de1be4b5fc65d5a07456a5486727df8b600293dda788bf492a6e887f0a5d863
-EBUILD xrn-9.02.ebuild 1559 BLAKE2B 59caf945f60a544390f8c006ea4d4ca825f9807ffda9e7bcad267ebf90524abd29ab9cd00cfde50d51a6251c9019496800eeb43972c909714fe3a47103916c96 SHA512 8b22bca7d836231205a593c95fe9e4dd6d66c3d6628936b779930a10a299dc3785273e4c85ee6ff504e204b96266ae6bcd28e4c5937ba3832e5fd9c1abdb830e
+EBUILD xrn-9.02-r1.ebuild 1477 BLAKE2B d7d1a90545f726133587dbbd6f711de57abb0c75cff5d4ec2d8015a29ed3bf04349bd96d864e609bdaecf7c4895380069ce15e65cb6ee55c05adc32121aab046 SHA512 2dafeb9a2f3c63d945318a5f5e56e05412113e3c1c202e5759764809f50e5003360520b5b0860257b6c7fcc2ba1e70af71dab54495423c5a08917efc7e6ee53f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-nntp/xrn/xrn-9.02-r1.ebuild b/net-nntp/xrn/xrn-9.02-r1.ebuild
index ab7ef9309d9c..10bad67c4a55 100644
--- a/net-nntp/xrn/xrn-9.02-r1.ebuild
+++ b/net-nntp/xrn/xrn-9.02-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://sipb.mit.edu/pub/${PN}/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-nntp/xrn/xrn-9.02.ebuild b/net-nntp/xrn/xrn-9.02.ebuild
deleted file mode 100644
index 9c87e2febf47..000000000000
--- a/net-nntp/xrn/xrn-9.02.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A small and fast news reader for X"
-HOMEPAGE="http://www.mit.edu/people/jik/software/xrn.html"
-SRC_URI="ftp://sipb.mit.edu/pub/${PN}/${P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXp
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	>=sys-apps/sed-4"
-
-src_compile() {
-	# English is the default language, but french and german are also
-	# supported, however only one language may be supported at a time:
-	local lingua
-	for lingua in ${LINGUAS} en ; do
-		case "${lingua}" in
-			en*)
-				MY_LANG="english"
-				break # Breaks the for loop.
-				;;
-			fr*)
-				MY_LANG="french"
-				break # Breaks the for loop.
-				;;
-			de*)
-				MY_LANG="german"
-				break # Breaks the for loop.
-				;;
-		esac
-	done
-
-	# Bugs to Gentoo bugzilla:
-	sed -i \
-		-e "s,bug-xrn@kamens.brookline.ma.us,https://bugs.gentoo.org/," \
-		-e "s,\(#ifndef CONFIG_H_IS_OK\),#define CONFIG_H_IS_OK\n\1," \
-		config.h
-
-	# Generate Makefile:
-	xmkmf || die "xmkmf failed"
-
-	# Use our own CFLAGS and our desired language:
-	emake -j1 CDEBUGFLAGS="${CFLAGS}" LANGUAGE="${MY_LANG}" || die "emake failed"
-}
-
-src_install() {
-	dobin xrn || die "dobin failed"
-	dodoc README README.Linux TODO CREDITS COMMON-PROBLMS || die "dodoc failed"
-
-	# Default settings:
-	insinto /etc/X11/app-defaults
-	newins XRn.ad XRn
-
-	newman xrn.man xrn.1
-}