| 1 |
ssuominen 11/10/01 10:08:12 |
| 2 |
|
| 3 |
Modified: ChangeLog aubio-0.3.2-r1.ebuild |
| 4 |
Log: |
| 5 |
Use python.eclass and set python2 as default wrt bugs #313523 and #385129 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.17 media-libs/aubio/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/aubio/ChangeLog?rev=1.17&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/aubio/ChangeLog?rev=1.17&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/aubio/ChangeLog?r1=1.16&r2=1.17 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v |
| 19 |
retrieving revision 1.16 |
| 20 |
retrieving revision 1.17 |
| 21 |
diff -u -r1.16 -r1.17 |
| 22 |
--- ChangeLog 29 Sep 2011 20:09:35 -0000 1.16 |
| 23 |
+++ ChangeLog 1 Oct 2011 10:08:12 -0000 1.17 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/aubio |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.16 2011/09/29 20:09:35 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/ChangeLog,v 1.17 2011/10/01 10:08:12 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 01 Oct 2011; Samuli Suominen <ssuominen@g.o> aubio-0.3.2-r1.ebuild: |
| 31 |
+ Use python.eclass and set python2 as default wrt bugs #313523 and #385129 |
| 32 |
|
| 33 |
29 Sep 2011; Samuli Suominen <ssuominen@g.o> aubio-0.3.2-r1.ebuild: |
| 34 |
USE="static-libs" and remove libtool files |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.11 media-libs/aubio/aubio-0.3.2-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild?rev=1.11&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild?rev=1.11&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild?r1=1.10&r2=1.11 |
| 43 |
|
| 44 |
Index: aubio-0.3.2-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v |
| 47 |
retrieving revision 1.10 |
| 48 |
retrieving revision 1.11 |
| 49 |
diff -u -r1.10 -r1.11 |
| 50 |
--- aubio-0.3.2-r1.ebuild 29 Sep 2011 20:09:35 -0000 1.10 |
| 51 |
+++ aubio-0.3.2-r1.ebuild 1 Oct 2011 10:08:12 -0000 1.11 |
| 52 |
@@ -1,10 +1,12 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v 1.10 2011/09/29 20:09:35 ssuominen Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.3.2-r1.ebuild,v 1.11 2011/10/01 10:08:12 ssuominen Exp $ |
| 57 |
|
| 58 |
-EAPI=4 |
| 59 |
+EAPI=3 |
| 60 |
|
| 61 |
-inherit eutils autotools |
| 62 |
+PYTHON_DEPEND="2:2.6" |
| 63 |
+ |
| 64 |
+inherit autotools eutils python |
| 65 |
|
| 66 |
DESCRIPTION="Library for audio labelling" |
| 67 |
HOMEPAGE="http://aubio.piem.org" |
| 68 |
@@ -18,7 +20,7 @@ |
| 69 |
RDEPEND="sci-libs/fftw:3.0 |
| 70 |
media-libs/libsndfile |
| 71 |
media-libs/libsamplerate |
| 72 |
- dev-lang/python |
| 73 |
+ || ( dev-lang/python:2.7 dev-lang/python:2.6 ) |
| 74 |
alsa? ( media-libs/alsa-lib ) |
| 75 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 76 |
lash? ( media-sound/lash )" |
| 77 |
@@ -27,7 +29,12 @@ |
| 78 |
dev-util/pkgconfig |
| 79 |
doc? ( app-doc/doxygen virtual/latex-base )" |
| 80 |
|
| 81 |
-DOCS=( AUTHORS ChangeLog README TODO ) |
| 82 |
+pkg_setup() { |
| 83 |
+ DOCS=( AUTHORS ChangeLog README TODO ) |
| 84 |
+ |
| 85 |
+ python_set_active_version 2 |
| 86 |
+ python_pkg_setup |
| 87 |
+} |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
epatch "${FILESDIR}"/aubio-0.3.2-multilib.patch |
| 91 |
@@ -55,7 +62,9 @@ |
| 92 |
} |
| 93 |
|
| 94 |
src_install() { |
| 95 |
- default |
| 96 |
+ # `default` would be enough here if python.eclass supported EAPI=4 |
| 97 |
+ emake DESTDIR="${D}" install || die |
| 98 |
+ dodoc "${DOCS[@]}" |
| 99 |
|
| 100 |
doman doc/*.1 |
| 101 |
if use doc; then |
| 102 |
@@ -69,3 +78,6 @@ |
| 103 |
|
| 104 |
find "${ED}"usr -name '*.la' -exec rm -f {} + |
| 105 |
} |
| 106 |
+ |
| 107 |
+pkg_postinst() { python_mod_optimize aubio; } |
| 108 |
+pkg_postrm() { python_mod_cleanup aubio; } |
Archives