diff options
author | 2009-06-05 10:14:36 +0000 | |
---|---|---|
committer | 2009-06-05 10:14:36 +0000 | |
commit | b02ca1df7497890ebd5eaf6ebdc947e55139d21a (patch) | |
tree | dd0f521e6fb9331e5042c4b2a7c72c9edba1aed5 /media-sound/edna | |
parent | Adjust use dependencies on marble. Per bug #272643. (diff) | |
download | gentoo-2-b02ca1df7497890ebd5eaf6ebdc947e55139d21a.tar.gz gentoo-2-b02ca1df7497890ebd5eaf6ebdc947e55139d21a.tar.bz2 gentoo-2-b02ca1df7497890ebd5eaf6ebdc947e55139d21a.zip |
Fix repoman warnings
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/edna')
-rw-r--r-- | media-sound/edna/edna-0.5-r4.ebuild | 19 | ||||
-rw-r--r-- | media-sound/edna/edna-0.5-r5.ebuild | 62 | ||||
-rw-r--r-- | media-sound/edna/edna-0.6.ebuild | 42 | ||||
-rw-r--r-- | media-sound/edna/files/edna-0.5-pep-0263.patch | 11 |
4 files changed, 25 insertions, 109 deletions
diff --git a/media-sound/edna/edna-0.5-r4.ebuild b/media-sound/edna/edna-0.5-r4.ebuild index be4f0502c3d3..8b31fbf33d68 100644 --- a/media-sound/edna/edna-0.5-r4.ebuild +++ b/media-sound/edna/edna-0.5-r4.ebuild @@ -1,27 +1,25 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.14 2007/01/05 17:29:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.15 2009/06/05 10:14:35 ssuominen Exp $ inherit eutils -IUSE="vorbis" - DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use" HOMEPAGE="http://edna.sourceforge.net/" - SRC_URI="mirror://sourceforge/edna/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86" +IUSE="vorbis" -DEPEND="dev-lang/python +RDEPEND=">=dev-lang/python-2.5 vorbis? ( dev-python/pyogg dev-python/pyvorbis )" +DEPEND="${RDEPEND}" src_install() { - elog "Installing in daemon mode" - newinitd ${FILESDIR}/edna.gentoo edna + newinitd "${FILESDIR}"/edna.gentoo edna dodir /usr/bin /usr/$(get_libdir)/edna /usr/$(get_libdir)/edna/templates exeinto /usr/bin ; newexe edna.py edna @@ -41,14 +39,11 @@ src_install() { } pkg_postinst() { - ewarn elog "Edit edna.conf to taste before starting (multiple source" elog "directories are allowed). Test edna from a shell prompt" elog "until you have it configured properly, then add edna to" elog "the default runlevel when you're ready. Add the USE flag" elog "vorbis if you want edna to serve ogg files." - elog elog "See edna.conf and the html docs for more info, and set" elog "PYTHONPATH=/usr/lib/edna to run from a shell prompt." - ewarn } diff --git a/media-sound/edna/edna-0.5-r5.ebuild b/media-sound/edna/edna-0.5-r5.ebuild deleted file mode 100644 index cb3aa461e868..000000000000 --- a/media-sound/edna/edna-0.5-r5.ebuild +++ /dev/null @@ -1,62 +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/edna/edna-0.5-r5.ebuild,v 1.5 2007/01/05 17:29:19 flameeyes Exp $ - -inherit eutils - -IUSE="vorbis" - -DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use" -HOMEPAGE="http://edna.sourceforge.net/" - -SRC_URI="mirror://sourceforge/edna/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" - -DEPEND="dev-lang/python - vorbis? ( dev-python/pyogg - dev-python/pyvorbis )" - -src_unpack() { - unpack ${A} - cd ${S} - if has_version '>=dev-lang/python-2.3' ; then - epatch ${FILESDIR}/${P}-pep-0263.patch || die "epatch failed" - fi -} - -src_install() { - elog "Installing in daemon mode" - newinitd ${FILESDIR}/edna.gentoo edna - - dodir /usr/bin /usr/$(get_libdir)/edna /usr/$(get_libdir)/edna/templates - exeinto /usr/bin ; newexe edna.py edna - exeinto /usr/$(get_libdir)/edna ; doexe ezt.py - exeinto /usr/$(get_libdir)/edna ; doexe MP3Info.py - insinto /usr/$(get_libdir)/edna/templates - insopts -m 644 - doins templates/* - - insinto /etc/edna - insopts -m 644 - doins edna.conf - dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates - - dodoc README ChangeLog - dohtml -r www/* -} - -pkg_postinst() { - ewarn - elog "Edit edna.conf to taste before starting (multiple source" - elog "directories are allowed). Test edna from a shell prompt" - elog "until you have it configured properly, then add edna to" - elog "the default runlevel when you're ready. Add the USE flag" - elog "vorbis if you want edna to serve ogg files." - elog - elog "See edna.conf and the html docs for more info, and set" - elog "PYTHONPATH=/usr/lib/edna to run from a shell prompt." - ewarn -} diff --git a/media-sound/edna/edna-0.6.ebuild b/media-sound/edna/edna-0.6.ebuild index 80451739b714..9f135b8b0de3 100644 --- a/media-sound/edna/edna-0.6.ebuild +++ b/media-sound/edna/edna-0.6.ebuild @@ -1,35 +1,32 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.6.ebuild,v 1.3 2009/03/07 06:49:31 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.6.ebuild,v 1.4 2009/06/05 10:14:35 ssuominen Exp $ -inherit eutils +EAPI=2 +inherit eutils multilib DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use" HOMEPAGE="http://edna.sourceforge.net/" SRC_URI="mirror://sourceforge/edna/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="flac ogg" -DEPEND="|| ( >=dev-lang/python-2.5 ( >=dev-lang/python-2.3 >=dev-python/ctypes-1.0.0 ) ) +RDEPEND=">=dev-lang/python-2.5 flac? ( media-libs/mutagen ) ogg? ( dev-python/pyogg )" -RDEPEND=${DEPEND} - -src_unpack() { - unpack ${A} - cd "${S}" +DEPEND="${RDEPEND}" - epatch "${FILESDIR}/${P}"-SystemExit.patch - epatch "${FILESDIR}/${P}"-flac.patch - epatch "${FILESDIR}/${P}"-daemon.patch - epatch "${FILESDIR}/${P}"-syslog.patch +src_prepare() { + epatch "${FILESDIR}/${P}"-SystemExit.patch \ + "${FILESDIR}/${P}"-flac.patch \ + "${FILESDIR}/${P}"-daemon.patch \ + "${FILESDIR}/${P}"-syslog.patch } src_install() { - einfo "Installing in daemon mode" newinitd "${FILESDIR}"/edna.gentoo edna dodir /usr/bin /usr/$(get_libdir)/edna /usr/$(get_libdir)/edna/templates @@ -56,14 +53,11 @@ pkg_postinst() { enewgroup edna enewuser edna -1 -1 -1 edna - einfo - einfo "Edit edna.conf to taste before starting (multiple source" - einfo "directories are allowed). Test edna from a shell prompt" - einfo "until you have it configured properly, then add edna to" - einfo "the default runlevel when you're ready. Add the USE flag" - einfo "vorbis if you want edna to serve ogg files." - einfo - einfo "See edna.conf and the html docs for more info, and set" - einfo "PYTHONPATH=/usr/lib/edna to run from a shell prompt." - einfo + elog "Edit edna.conf to taste before starting (multiple source" + elog "directories are allowed). Test edna from a shell prompt" + elog "until you have it configured properly, then add edna to" + elog "the default runlevel when you're ready. Add the USE flag" + elog "vorbis if you want edna to serve ogg files." + elog "See edna.conf and the html docs for more info, and set" + elog "PYTHONPATH=/usr/lib/edna to run from a shell prompt." } diff --git a/media-sound/edna/files/edna-0.5-pep-0263.patch b/media-sound/edna/files/edna-0.5-pep-0263.patch deleted file mode 100644 index 70294d9b1c23..000000000000 --- a/media-sound/edna/files/edna-0.5-pep-0263.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- edna.py.orig 2003-04-19 17:08:40.000000000 -0700 -+++ edna.py 2005-09-08 19:29:28.000000000 -0700 -@@ -1,4 +1,8 @@ - #!/usr/bin/env python -+# -*- coding: UTF-8 -*- -+# -+# the line above is to prevent a warning in python 2.3 or later; see: -+# http://www.python.org/peps/pep-0263.html - # - # edna.py -- an MP3 server - # |