gentoo resync : 19.04.2018

3 files changed, 2 insertions, 68 deletions

diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 4b8293476c92..c32387b398ad 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -2,6 +2,5 @@ AUX herrie-2.2-fix-buildsystem.patch 1183 BLAKE2B fc3752e625b75d50f0aa3c72bcf738
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r1.ebuild 1833 BLAKE2B 0d781fdb2ba65af7d9acfed58fc1c8ee1d80199b1c4c2f17b19113f543de728dee876c785c8dd1d82fffe9558dca719f3e91e21ab0ae7c3763e90ad2c2a0f475 SHA512 fc66509b828993cc0b3acfbca626ea5394ad7a021d8ae91d802d5dd5cfe3851a35a271378568129aa3794097bba6909ad102aa3faa54582d8b1de7df585df5b6
-EBUILD herrie-2.2.ebuild 2082 BLAKE2B 3c0b90662572380ba58e3e2b86960b7fd60d5fc46e263f47f673fec0c7bf8fb9202ef9f5850380e5f2a0829d9ec67689efa738ca97512df39cbde55fe0e1b0d6 SHA512 53fb61e64bc52f0d5cb414d5aa8c97980ea1cdaf1fcaaa0e8254f795787744028e99280e2cf938482904efbc4c9f2a27adbbc78a331526af0c467d9e18b2081d
+EBUILD herrie-2.2-r1.ebuild 1832 BLAKE2B 2b43836390c97a1415f11268e9b0f08a38549a4596cac0f65a8b7042f2977c8a8408c75ddb0da320de1cae177f76c2962ead87a70dbf536470742c98d16ade03 SHA512 e08c98b79cb238770b4fa37acebffe41298034e36b4e54e0c8746c918ac13514fa91c346ac557ec2fdae32342f367c29c7053aa18855698e0ce81031991a7352
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
index d17a5548fe00..b54555ffc4fc 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
 REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
 
diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild
deleted file mode 100644
index 49e752b97c92..000000000000
--- a/media-sound/herrie/herrie-2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Herrie is a command line music player"
-HOMEPAGE="http://herrie.info/"
-SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
-
-RDEPEND="sys-libs/ncurses[unicode?]
-	>=dev-libs/glib-2:2
-	ao? ( media-libs/libao )
-	alsa? ( media-libs/alsa-lib )
-	http? ( net-misc/curl )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad
-		media-libs/libid3tag )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( media-libs/libvorbis )
-	xspf? ( >=media-libs/libxspf-1.2 )
-	!ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-chost_issue.patch \
-		"${FILESDIR}"/${P}-libxspf.patch
-}
-
-src_configure() {
-	if ! use ao && ! use alsa && ! use pulseaudio && ! use oss; then
-		ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
-	fi
-
-	local EXTRA_CONF="verbose no_strip"
-	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
-	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
-	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
-	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
-	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
-	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
-	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
-	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
-	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
-	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
-	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
-	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
-
-	einfo "./configure ${EXTRA_CONF}"
-	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
-		./configure ${EXTRA_CONF} || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README
-}