jlec 15/03/21 17:42:37
Modified: metadata.xml edna-0.6.ebuild edna-0.5-r4.ebuild
ChangeLog
Log:
use dobin instead of exeinto /usr/bin/ && doexe; bump to EAPI=5 and new
python eclasses, #313947
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.5 media-sound/edna/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/metadata.xml?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/metadata.xml?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/edna/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 7 Sep 2012 22:05:49 -0000 1.4
+++ metadata.xml 21 Mar 2015 17:42:37 -0000 1.5
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<herd>sound</herd>
-<longdescription>
+ <herd>sound</herd>
+ <longdescription>
Edna is Greg Stein's http streaming audio server for mp3 and ogg files.
</longdescription>
</pkgmetadata>
1.7 media-sound/edna/edna-0.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/edna-0.6.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/edna-0.6.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/edna-0.6.ebuild?r1=1.6&r2=1.7
Index: edna-0.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.6.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- edna-0.6.ebuild 9 Jun 2012 23:07:14 -0000 1.6
+++ edna-0.6.ebuild 21 Mar 2015 17:42:37 -0000 1.7
@@ -1,9 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.6
2012/06/09 23:07:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.6.ebuild,v 1.7
2015/03/21 17:42:37 jlec Exp $
-EAPI=2
-inherit eutils multilib user
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib user python-r1
DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
HOMEPAGE="http://edna.sourceforge.net/";
@@ -14,13 +17,16 @@
KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="flac ogg"
-RDEPEND=">=dev-lang/python-2.5
- flac? ( media-libs/mutagen )
- ogg? ( dev-python/pyogg )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ flac? ( media-libs/mutagen[${PYTHON_USEDEP}] )
+ ogg? ( dev-python/pyogg[${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}"
src_prepare() {
- epatch "${FILESDIR}/${P}"-SystemExit.patch \
+ epatch \
+ "${FILESDIR}/${P}"-SystemExit.patch \
"${FILESDIR}/${P}"-flac.patch \
"${FILESDIR}/${P}"-daemon.patch \
"${FILESDIR}/${P}"-syslog.patch
@@ -29,19 +35,19 @@
src_install() {
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 /usr/$(get_libdir)/edna/resources
- doins resources/*
+ python_foreach_impl python_newscript edna.py edna
+
+ python_scriptinto /usr/$(get_libdir)/edna
+ python_foreach_impl python_domodule ezt.py MP3Info.py
+
+ python_foreach_impl python_optimize
+
+ insinto /usr/$(get_libdir)/edna
+ doins -r templates resources
insinto /etc/edna
- insopts -m 644
doins edna.conf
+
dosym /usr/$(get_libdir)/edna/resources /etc/edna/resources
dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates
1.17 media-sound/edna/edna-0.5-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild?r1=1.16&r2=1.17
Index: edna-0.5-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- edna-0.5-r4.ebuild 9 Jun 2012 23:07:14 -0000 1.16
+++ edna-0.5-r4.ebuild 21 Mar 2015 17:42:37 -0000 1.17
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.16
2012/06/09 23:07:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.17
2015/03/21 17:42:37 jlec Exp $
inherit eutils multilib
@@ -21,16 +21,13 @@
src_install() {
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
+ newbin edna.py edna
+ exeinto /usr/$(get_libdir)/edna
+ doexe ezt.py 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
1.33 media-sound/edna/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/ChangeLog?rev=1.33&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/ChangeLog?rev=1.33&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/edna/ChangeLog?r1=1.32&r2=1.33
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog 7 Sep 2012 22:05:49 -0000 1.32
+++ ChangeLog 21 Mar 2015 17:42:37 -0000 1.33
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/edna
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.32
2012/09/07 22:05:49 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.33
2015/03/21 17:42:37 jlec Exp $
+
+ 21 Mar 2015; Justin Lecher <[email protected]> edna-0.5-r4.ebuild,
+ edna-0.6.ebuild, metadata.xml:
+ use dobin instead of exeinto /usr/bin/ && doexe; bump to EAPI=5 and new
python
+ eclasses, #313947
07 Sep 2012; Tim Harder <[email protected]> metadata.xml:
Remove redundant maintainer from metadata.
@@ -113,4 +118,3 @@
14 Dec 2003; <[email protected]> edna-0.5.ebuild, metadata.xml,
files/edna.gentoo:
new ebuild for edna streaming audio server
-
