From 302e5d43fa26601e51646f751e46dc41196fb744 Mon Sep 17 00:00:00 2001 From: Robert Buchholz Date: Mon, 30 Apr 2007 17:57:41 +0000 Subject: Install herrie.conf as .sample to conform with upstream intentions (Portage version: 2.1.2.2) --- media-sound/herrie/ChangeLog | 8 ++- media-sound/herrie/files/digest-herrie-1.6.1 | 3 - media-sound/herrie/files/digest-herrie-1.6.1-r1 | 3 + media-sound/herrie/herrie-1.6.1-r1.ebuild | 76 +++++++++++++++++++++++++ media-sound/herrie/herrie-1.6.1.ebuild | 76 ------------------------- 5 files changed, 86 insertions(+), 80 deletions(-) delete mode 100644 media-sound/herrie/files/digest-herrie-1.6.1 create mode 100644 media-sound/herrie/files/digest-herrie-1.6.1-r1 create mode 100644 media-sound/herrie/herrie-1.6.1-r1.ebuild delete mode 100644 media-sound/herrie/herrie-1.6.1.ebuild (limited to 'media-sound/herrie') diff --git a/media-sound/herrie/ChangeLog b/media-sound/herrie/ChangeLog index 5a6f6d04a8bd..675a2518734f 100644 --- a/media-sound/herrie/ChangeLog +++ b/media-sound/herrie/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/herrie # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.6 2007/04/21 17:17:18 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/ChangeLog,v 1.7 2007/04/30 17:57:41 rbu Exp $ + +*herrie-1.6.1-r1 (30 Apr 2007) + + 30 Apr 2007; Robert Buchholz -herrie-1.6.1.ebuild, + +herrie-1.6.1-r1.ebuild: + Install herrie.conf as .sample to conform with upstream intentions *herrie-1.6.1 (21 Apr 2007) diff --git a/media-sound/herrie/files/digest-herrie-1.6.1 b/media-sound/herrie/files/digest-herrie-1.6.1 deleted file mode 100644 index 0b433d2cd81c..000000000000 --- a/media-sound/herrie/files/digest-herrie-1.6.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 eb921bf87856d7b2cf86da2d303e85bf herrie-1.6.1.tar.bz2 51267 -RMD160 ddb881849e6d6c9f97e4fd98ad8176c48d49f0cf herrie-1.6.1.tar.bz2 51267 -SHA256 71d7e4cedda21fab6971c1223bd4af5cb6faaee0f9baef19095ec9697403b709 herrie-1.6.1.tar.bz2 51267 diff --git a/media-sound/herrie/files/digest-herrie-1.6.1-r1 b/media-sound/herrie/files/digest-herrie-1.6.1-r1 new file mode 100644 index 000000000000..0b433d2cd81c --- /dev/null +++ b/media-sound/herrie/files/digest-herrie-1.6.1-r1 @@ -0,0 +1,3 @@ +MD5 eb921bf87856d7b2cf86da2d303e85bf herrie-1.6.1.tar.bz2 51267 +RMD160 ddb881849e6d6c9f97e4fd98ad8176c48d49f0cf herrie-1.6.1.tar.bz2 51267 +SHA256 71d7e4cedda21fab6971c1223bd4af5cb6faaee0f9baef19095ec9697403b709 herrie-1.6.1.tar.bz2 51267 diff --git a/media-sound/herrie/herrie-1.6.1-r1.ebuild b/media-sound/herrie/herrie-1.6.1-r1.ebuild new file mode 100644 index 000000000000..a8e1306a15b2 --- /dev/null +++ b/media-sound/herrie/herrie-1.6.1-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.6.1-r1.ebuild,v 1.1 2007/04/30 17:57:41 rbu 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 ~x86" +IUSE="ao http modplug mp3 scrobbler sdl sndfile vorbis xspf unicode + linguas_de linguas_nl linguas_pl linguas_tr" + +DEPEND="sys-libs/ncurses + >=dev-libs/glib-2.0 + ao? ( media-libs/libao ) + http? ( net-misc/curl ) + modplug? ( media-libs/libmodplug ) + mp3? ( media-libs/libmad + media-libs/libid3tag ) + scrobbler? ( net-misc/curl + dev-libs/openssl ) + sdl? ( media-libs/libsdl ) + sndfile? ( media-libs/libsndfile ) + vorbis? ( media-libs/libvorbis ) + xspf? ( >=media-libs/libspiff-0.6.5 )" +RDEPEND="${DEPEND}" +DEPEND="sys-devel/gettext + dev-util/pkgconfig" + +pkg_setup() { + if use sdl && ! use ao ; then + ewarn "Please be aware that SDL support in Herrie is highly experimental. Use it at your own risk." + fi + if use sdl && use ao ; then + ewarn "You cannot use SDL and ao at the same time, using ao." + fi + 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.5.1-chost.patch" + sed -i "47s:CFG_STRIP=-s:unset CFG_STRIP:" configure +} + +src_compile() { + local EXTRA_CONF="verbose" + use ao && EXTRA_CONF="${EXTRA_CONF} ao" + use http || EXTRA_CONF="${EXTRA_CONF} no_http" + use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3" + use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug" + use scrobbler || EXTRA_CONF="${EXTRA_CONF} no_scrobbler" + use sdl && ! use ao && EXTRA_CONF="${EXTRA_CONF} sdl" + 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" + + 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-1.6.1.ebuild b/media-sound/herrie/herrie-1.6.1.ebuild deleted file mode 100644 index e94dfb218a87..000000000000 --- a/media-sound/herrie/herrie-1.6.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-1.6.1.ebuild,v 1.1 2007/04/21 17:17:18 rbu 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 ~x86" -IUSE="ao http modplug mp3 scrobbler sdl sndfile vorbis xspf unicode linguas_nl linguas_tr linguas_de linguas_pl" - -DEPEND="sys-libs/ncurses - >=dev-libs/glib-2.0 - ao? ( media-libs/libao ) - http? ( net-misc/curl ) - modplug? ( media-libs/libmodplug ) - mp3? ( media-libs/libmad - media-libs/libid3tag ) - scrobbler? ( net-misc/curl - dev-libs/openssl ) - sdl? ( media-libs/libsdl ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis ) - xspf? ( >=media-libs/libspiff-0.6.5 )" -RDEPEND="${DEPEND}" -DEPEND="sys-devel/gettext - dev-util/pkgconfig" - -pkg_setup() { - if use sdl && ! use ao ; then - ewarn "Please be aware that SDL support in Herrie is highly experimental. Use it at your own risk." - fi - if use sdl && use ao ; then - ewarn "You cannot use SDL and ao at the same time, using ao." - fi - 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.5.1-chost.patch" - sed -i "47s:CFG_STRIP=-s:unset CFG_STRIP:" configure -} - -src_compile() { - local EXTRA_CONF="verbose" - use ao && EXTRA_CONF="${EXTRA_CONF} ao" - use http || EXTRA_CONF="${EXTRA_CONF} no_http" - use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3" - use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug" - use scrobbler || EXTRA_CONF="${EXTRA_CONF} no_scrobbler" - use sdl && ! use ao && EXTRA_CONF="${EXTRA_CONF} sdl" - 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" - - 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 - mv ${D}/etc/herrie.conf{.sample,} -} -- cgit v1.2.3-65-gdbad