use dobin instead of exeinto /usr/bin/ && doexe; bump to EAPI=5 and new python eclasses, #313947

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 60 insertions, 45 deletions

diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index 5532551817c0..c75936fe3bf3 100644
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -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 <jlec@gentoo.org> 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 <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
@@ -113,4 +118,3 @@
   14 Dec 2003; <nerdboy@gentoo.org> edna-0.5.ebuild, metadata.xml,
   files/edna.gentoo:
   new ebuild for edna streaming audio server
-
diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 5c4975d6b624..13a2210fd024 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX edna-0.6-SystemExit.patch 357 SHA256 530edecafcce36325efa7a68bb44438141639cc2d46bcda6cdf647ae28477cbf SHA512 281557f2a4c90941918bc7b0330b9edceb6f37441bd6726f64f0633e7b5dc0a507a933fe011e0e2eb9eae7639db9c54195ec3374b24cffa7697fbcad855e0bd7 WHIRLPOOL 0ab11df5aec4c3a917dc32c65a437dceb20775b25dbe3f6860639d85dc7f5476894e748cadea797600bebbd93d89b42d04b21e0fb721a993fb161081f58e8aed
 AUX edna-0.6-daemon.patch 2160 SHA256 eda1dc40464a031f816f1023978bb2f7180532cd1e3d134d9bbf52f37cdb7fcd SHA512 ade179d94a2ecdaafc3da58323e4e0cd8a7ede123fad51d6367b23fea235dfd70e5afd6b1562ee8703c4c5478d28358adb6d454893bff70885563e09cc03245e WHIRLPOOL d0f07e608bb459a9f9a24f9e768692fa91b89ca6509049842ceeb9943402353ad2f78500f0f244b7516a5015fa94c53b844ff93eb3cfff4b5067774e2e22af3a
@@ -7,19 +7,27 @@ AUX edna-0.6-flac.patch 1989 SHA256 ff09556d11afa9c3681c71e6223f0fe1de10f7f4e345
 AUX edna-0.6-syslog.patch 2455 SHA256 0f1afbe35cffbb0cd355ef658e2fee142f9e05e7e798a989dd08a0cf850cb453 SHA512 458e3170c7b1dc556474811c6786576e6b6b72ad3a887f96f91a1a7f1563274f72b5e717e1e650f3ddff63a6dee41bd51893a2f5a856401f286f7a9b52af153d WHIRLPOOL 153ee57533dcd46c97bd09ffbe7fdde9ec1f6a5e5ba6ce6fc02c0abf97755f7700056fd0753396f9f84ff634af15cff9be27b3d3d3758265c2e51a001cacc5e4
 AUX edna.gentoo 594 SHA256 4c2bc86ab3505f0756b4c1fa28fa24bbce451d5f4972fb1b2df41c84acacb34f SHA512 ec537f261742f675dec6cfc1d30785e2bf59985644cd304d556a61f8f2c73e7bcc13153add26286fd67839db79a6cc7870753ed588166972354f37727bc777ae WHIRLPOOL ef9b5bec61ea596dab0c1cb8d1e62af5e6fece009cc1228863519cc8ced9ecec3fe3d5edaa9956c92d03f3477f149f20f6690db1349cdde4dc30113980da2b68
 DIST edna-0.5.tar.gz 85785 SHA256 334e9b9a487757bde196470933a006b4511336d81d47a77e4dceed96bfe4937f
-DIST edna-0.6.tar.gz 50303 SHA256 601aea3af9fe37407cd9523978e69c71785e09b5d8d57ca911a74c3ce3740c4c
-EBUILD edna-0.5-r4.ebuild 1577 SHA256 782f4663f1d3926a9198f4bf6a23b68c112b8a5caf5c4db58bb2c7c5ef9322e8 SHA512 c97523808521967cd934945fef5e025eb1859b59b4df16d525edcdbf5cc1b9f4125d3dce298df9d12027dcd5f69c604d8eed2d377830a890b5294d2848e24fc0 WHIRLPOOL 065588ad02e802d54909bc5660d1a97aebb3da30dc59de9d01c45ee0cac7b2f605856084c06ef779402207fb7c2ec05ce8fb4a034bf66a758f7d1a0cf1fa7689
-EBUILD edna-0.6.ebuild 1937 SHA256 9063f1c5dc7c59f95ae023f1822e2d0b9b9403127751c5a47bdae68e1b7966ac SHA512 22ff1b4e9d34b65a347e09f4ed53b457bed5279a3b2d05d51966c006e0add71ae95f3d66827ca99cdb2955570938af4a62a2bd16419f8eba3e1a86f3dfbd848f WHIRLPOOL 78ebf48ea55066e40710cfa9202d0bfe21b1e706c749325aec72da1593e083ce3ec5a6dc497ec25d34dd2099c65081813da8c271d9536614fb711a9bca7f943d
-MISC ChangeLog 4139 SHA256 3c383b2a5181185b275fcd358ca1ca48535b2c95a30c1fc037534bbd4438afb5 SHA512 31620181cb84594bdb336b5e9c232978b5aa50d722d1ba27d5e5311d91c74db9249a8629c0d8d01c43180113f464ad834023b0a010eb85230796f8b99c408b1a WHIRLPOOL 27a5f9ca7701394abfabeeaaddc0b73b6f9730d48f029ba74b96ad9cc446e8d5419245087b2d7111c02d1eba3da6ad3743e8a306fd5817797d0271f66f124672
-MISC metadata.xml 269 SHA256 bbc15db6c269b6411b46b134d16a44ea50d4c817c63deb9fbc2fcb7c3ead37cf SHA512 b1315e350faa3cee379e395476e1d4dad961a8a9de35fb3c8ff63e1f82ff4423a35202bb9a07ac520bc46d45c3440ac7fc28f4cbdd7a02b1e5b148be71df5a58 WHIRLPOOL dd960d387dd2ff84a8ca75593ebc25359ad7388e42a47034638c0df3b95458aae9d5952fe4f24a300011832e9273c9327789dbb694b08a8a28669a9975be092d
+DIST edna-0.6.tar.gz 50303 SHA256 601aea3af9fe37407cd9523978e69c71785e09b5d8d57ca911a74c3ce3740c4c SHA512 d48786829c127b0a1e24116524b8b95a91990c8952882ef00d7761fc6c1dd9b4b0037af2b176dbfd066b6d80670bad7a0c724af984b24c6b4bde93c884c3b76b WHIRLPOOL 3850124bdf07f79f10db2926968a0fde99884781d5afb9a67b9ad5afd014e65723e80fd966f9b91cb5e4aba709a6faadcf494be71421d0e1c3b150541db4dcad
+EBUILD edna-0.5-r4.ebuild 1407 SHA256 144b7d97ff24ef91017fc53651ffd31f02610c99581a437e96218ce24c4fd086 SHA512 bea4a6d10bedea99c1446a181479df9c2a6ed2b688e2d1e5465db71436b989f073ba7103fadb22e6979f0c78d1898b1bf15c5b4f9cf8d755352490aa495a9107 WHIRLPOOL 10abff0fc19f74a2d09c738aa64e3bfca3b1e086664ac723839ec9cfef61d27c11240005a57c2ef3fd5516cc5690ae673f308ddbe2a36b7b95f06c1a7099feec
+EBUILD edna-0.6.ebuild 1929 SHA256 5472cab782395926c1cc9291ca8567347f8ca53717afcf956e4d1278804f4a71 SHA512 1592b38696122f4a30e95be410915195cb272ea84312d816bafb9b1d0f590eec700e6a82a9b49ec67a281e909c6f8e57ab26dd63eacb56542ec805ce73bb7467 WHIRLPOOL 76fd1392654f1771692d6119423b63f451a13a5d16a4e403c6c233aea7beea9b89b8ff8a46fee2860ace2898737497293a31b21269ca328f51b5af308c31a73d
+MISC ChangeLog 4335 SHA256 28fd7c90b5e24bd6e468c057284b67e9597ff17d0596b131bf2fdc7b15beb128 SHA512 81f36a68a0a40556111055ca418eac912c7a6e61d9ed03065439dbce63d7381619a1c8b6da1e499880c6fac47d41956a9b0384bb4409f964a2997499eb5ec815 WHIRLPOOL 77069a0dcca9a058c1881d7847b19ea7ffd7501d1fea16f73b59ddb6ff5994f10c00b0ced8fae1ed4aceffc295d56113083661eaf841453a8b96ab201a160e79
+MISC metadata.xml 273 SHA256 40817e79a26072d009f7ce4563dc26210f5ed002fe48956738ba5b30fb3d3589 SHA512 43388d847d734bd9174350bda66533cd49bb1e279c4fbc8c4152ae25ea239705d7155981e27669236fcee985c647c68ec666ff6e06bf48eee9d16e5521883c68 WHIRLPOOL f4889d0b068bc81d8e2a4cc139c413a8865c87a00f5e26b0c9c79d4b612e1257fb777d03c1bbef699e86e792e0754c68e894278ecf16613556e99c747327c4e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQSm/DAAoJEEqz6FtPBkyjdqoH/1nH3RYrCoFHZ5fglh6rJ31e
-+dFn2xYOwACtfYxtYH9J7KMJotxvRTM4sr5CE3RyZWMju9d+kQmerR8Cy91FYNql
-X+KcJZcwdP1A0OU+KEsm2ehgmqTzIQu6eFUvstk6lxPbGwgOeP8NYSyif0YoAr90
-BJDYgt59ik6oCursVJyOTS7/G8Fx/E20X6vDR0qaOm1hbwlp4E7wmLuOE6+Sor8j
-tKuLIVMRewvXVt5o8dJx3Uxsw1IZRz+F3lBrM4MDLX3DbsSwnlDLI0ZHsdGDq2Zz
-e3/G20hcR6uBvucq0gvJpy7y91uJkaY2Swf42aoy/vkSXUBUmN/BYpwiWUkvgp0=
-=IC8w
+iQJ8BAEBCgBmBQJVDa2RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir88YQAI9rGwdKYx0Vkim1UTPy9/mp
+PJlPIJFI1KvnjGGlh2leled2zOq/sYCNA2MbitLfixq25J8Pf2lE+IC9D/SYsan8
+9GPIFtKsORuxZ4VujEdE/XV9PO/z9ELZaqSxDYVt03VWb8XVP7U+AnGxd3r3Qy6o
+n/9I+QRnpTKlCESsRxXLaG3rXdJar8BL1FMUkmXLj00nYwZBWUSQ1SNljUMWAkcI
+aoYlmM/gX2k/p/R3PqJo4eyU0lHWbTzd1dNLVDXxpyICtadCbPtNVyT6lyMALrC8
+8o0kwnV3Ua43kMyLlqWxWL2x5dQxd3W+8wA8tvmUHFJmGlafwIkLa6OJhKSRJoMu
+kSgwJGigsOL7O9R7bkP+VHzh/iueTTj+yBXY813YlL0kvHOhtcIoiGdM9qG444yP
+nN4OC0n5EzsckdYuoLB5MJ7svTwZDxD1u5H4RUlpHWT3QIEHyOhM8z8oosxiF3G8
+hUDmA7Jl7OF0dWgh/jhJ336H8zMA7486P5NXWfA16bWRDnz+13mC3TL8/swnGPy1
+DNYexcUxIi02JSk8g7ioaDpZ2pGuOefVxxdzKnHJbNPv8lpevRV1+AllvpK5JYUo
+eSf6RNhuBX2AMVHfPPpDiRJF+sD6VLjPkfp1xRwGuINiRmBrMevNaqFKPpLF27kv
+RASWzl6D6CThq3AU9tvG
+=SbkY
 -----END PGP SIGNATURE-----
diff --git a/media-sound/edna/edna-0.5-r4.ebuild b/media-sound/edna/edna-0.5-r4.ebuild
index adc7d5641eab..1bfb4e44b5ca 100644
--- a/media-sound/edna/edna-0.5-r4.ebuild
+++ b/media-sound/edna/edna-0.5-r4.ebuild
@@ -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 @@ DEPEND="${RDEPEND}"
 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
 
diff --git a/media-sound/edna/edna-0.6.ebuild b/media-sound/edna/edna-0.6.ebuild
index 2ac117c6e9ce..11337c46bab9 100644
--- a/media-sound/edna/edna-0.6.ebuild
+++ b/media-sound/edna/edna-0.6.ebuild
@@ -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 @@ SLOT="0"
 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_prepare() {
 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
 
diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml
index 584fe969320e..933102b9a5e4 100644
--- a/media-sound/edna/metadata.xml
+++ b/media-sound/edna/metadata.xml
@@ -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>