summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-06-01 16:13:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-06-01 16:13:51 +0000
commit54661609a91afc1867a203ab6b35dec8d56e12da (patch)
tree7487d5e89ccb1e2c1881649a53de5bb1d13b010c
parentppc stable #267737 (diff)
downloadhistorical-54661609a91afc1867a203ab6b35dec8d56e12da.tar.gz
historical-54661609a91afc1867a203ab6b35dec8d56e12da.tar.bz2
historical-54661609a91afc1867a203ab6b35dec8d56e12da.zip
old
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
-rw-r--r--media-sound/herrie/ChangeLog5
-rw-r--r--media-sound/herrie/Manifest8
-rw-r--r--media-sound/herrie/files/herrie-chost_issue.patch (renamed from media-sound/herrie/files/herrie-1.8-chost.patch)0
-rw-r--r--media-sound/herrie/herrie-2.0.2.ebuild84
-rw-r--r--media-sound/herrie/herrie-2.2.ebuild6
5 files changed, 7 insertions, 96 deletions
diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog
index 0af47a555d07..db242eb93ff8 100644
--- a/media-sound/herrie/ChangeLog
+++ b/media-sound/herrie/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for media-sound/herrie
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.35 2009/06/01 15:50:47 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.36 2009/06/01 16:13:50 ssuominen Exp $
01 Jun 2009; Ferris McCormick <fmccor@gentoo.org> herrie-2.2.ebuild:
Sparc stable, required for Bug #271815.
@@ -72,8 +72,7 @@
*herrie-1.9.2 (20 Jan 2008)
20 Jan 2008; Robert Buchholz <rbu@gentoo.org>
- -files/herrie-1.5.1-chost.patch, -herrie-1.7-r1.ebuild,
- -herrie-1.8.1.ebuild, +herrie-1.9.2.ebuild:
+ -herrie-1.7-r1.ebuild, -herrie-1.8.1.ebuild, +herrie-1.9.2.ebuild:
Version bump, introducing directory search, new translations, and bug fixes.
Clean up old versions.
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index cc0a033e5cd9..c6f7f1102f2f 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -1,8 +1,6 @@
-AUX herrie-1.8-chost.patch 547 RMD160 77f7506ee0b3f4eceeeb3b43a020086fba6739ac SHA1 89c2200eeb55a2c56f83c0ad67ebe371e559a7b6 SHA256 07371e7b5feff1f2b9a1cce1875be9def54c478084f2635a30bdcc8e6333f2f2
AUX herrie-2.2-libxspf.patch 2959 RMD160 cf32a5c6458498f46d80b41c10ec3001854dd19e SHA1 988ad8493c6fd31112017b171589f9343a236080 SHA256 ab87541a31ff42b8ce27b1a3e1e9e987e288de522f31b01caee7753dfd9052e7
-DIST herrie-2.0.2.tar.bz2 69971 RMD160 e91ae93d54ce8039828fb24a1a56ad691de6ed73 SHA1 0d3bffb5fa592945995ab34d0611f563a9bae100 SHA256 f2d8286c802f089bc7b5c5557e2097be6c10add72c982b55bf491ac32c30708b
+AUX herrie-chost_issue.patch 547 RMD160 77f7506ee0b3f4eceeeb3b43a020086fba6739ac SHA1 89c2200eeb55a2c56f83c0ad67ebe371e559a7b6 SHA256 07371e7b5feff1f2b9a1cce1875be9def54c478084f2635a30bdcc8e6333f2f2
DIST herrie-2.2.tar.bz2 71596 RMD160 e0f70ca4d867cf6cdbb452bd0f0860ef1f5a9f39 SHA1 ae5c39be11aeb19898cd3f968580eafc623830b7 SHA256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b
-EBUILD herrie-2.0.2.ebuild 2656 RMD160 f5ca9e07d96af936f4849cf274a51ca9efa65102 SHA1 160e2d9cea4978ea8a439c88ea9a9ed68b18c405 SHA256 559c7ff4cfb82eb20de6631a1aa069f451d16a16c9a7fa9f6674e4c0f80dd55e
-EBUILD herrie-2.2.ebuild 2387 RMD160 6ed3804e741c2ae62b1a09864e0e667f99b2e009 SHA1 6b345955d2a1be62aa1c129ab9366ac0547aa8d3 SHA256 6e443516c8dd8d2d7e29139809f1db9e110616ac49c1324a19a98c24d7893501
-MISC ChangeLog 5473 RMD160 ce9c8ec451909794f57f012dab94e4d5fbe3d1cc SHA1 281d450ed14374a9cab87ecd12d2dc3e6f7f0111 SHA256 0e83b9c11b2a2ba81a1e678a94ad6fd5a8d6f15a41c4155be322102dd81095b8
+EBUILD herrie-2.2.ebuild 2329 RMD160 5447529a246cc27cbddc6faa8e2e66f78b0d4ddf SHA1 847a2071aa0217c8504a08e6039d9163ff031297 SHA256 92440f8815cf25aca219bbe7d713d17f9e905d743c1916c1c3041e0aaa34527f
+MISC ChangeLog 5441 RMD160 0dd1b63b5b4ed22af71d5bb11b4ff7d2a1defe3a SHA1 4f632f589ba5295e856e835d31e4972ef64e20ee SHA256 82e2a78a85c3953fafcd9c5e665b7f6e286635dff6438b513cbfe140f301d3f5
MISC metadata.xml 1067 RMD160 785c43394547d03304aeaf6957e8b101508c5d20 SHA1 6fde495a04cfed75319b2d8d99b8bbc93d418598 SHA256 b12095da84b5e1012a64c3f6f957e110ede9928bee3f50022aad88a524b90973
diff --git a/media-sound/herrie/files/herrie-1.8-chost.patch b/media-sound/herrie/files/herrie-chost_issue.patch
index 1949972baa6a..1949972baa6a 100644
--- a/media-sound/herrie/files/herrie-1.8-chost.patch
+++ b/media-sound/herrie/files/herrie-chost_issue.patch
diff --git a/media-sound/herrie/herrie-2.0.2.ebuild b/media-sound/herrie/herrie-2.0.2.ebuild
deleted file mode 100644
index 3d5640d8526e..000000000000
--- a/media-sound/herrie/herrie-2.0.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.0.2.ebuild,v 1.5 2008/06/19 11:50:12 opfer Exp $
-
-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 sparc x86"
-IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
-
-# Supported languages
-APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
-for X in ${APP_LINGUAS}; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DEPEND="sys-libs/ncurses
- >=dev-libs/glib-2.0
- 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/libspiff-0.6.5 )
- !ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )
- "
-RDEPEND="${DEPEND}"
-DEPEND="nls? ( sys-devel/gettext )
- dev-util/pkgconfig"
-
-pkg_setup() {
- if use unicode && ! built_with_use sys-libs/ncurses unicode; then
- echo
- eerror "Rebuild sys-libs/ncurses with USE=unicode if you need unicode in herrie."
- die "Rebuild sys-libs/ncurses with USE=unicode if you need unicode in herrie."
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${PN}-1.8-chost.patch"
-}
-
-src_compile() {
- if ! use ao && ! use alsa && ! use pulseaudio && ! use oss ; then
- ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
- fi
-
- # We could add coreaudio here if on osx
- 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"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc README ChangeLog
-}
diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild
index f43967c4db6f..58cd2875418a 100644
--- a/media-sound/herrie/herrie-2.2.ebuild
+++ b/media-sound/herrie/herrie-2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.2.ebuild,v 1.5 2009/06/01 15:50:47 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.2.ebuild,v 1.6 2009/06/01 16:13:50 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -14,7 +14,6 @@ SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
-# Supported languages
APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
for X in ${APP_LINGUAS}; do
IUSE="${IUSE} linguas_${X}"
@@ -38,7 +37,7 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8-chost.patch \
+ epatch "${FILESDIR}"/${PN}-chost_issue.patch \
"${FILESDIR}"/${P}-libxspf.patch
}
@@ -47,7 +46,6 @@ src_configure() {
ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
fi
- # We could add coreaudio here if on osx
local EXTRA_CONF="verbose no_strip"
use ao && EXTRA_CONF="${EXTRA_CONF} ao"
use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"