| 1 |
commit: 9853473d5594ddfd09ad9cf16d1aecf5ab99e994 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 4 16:02:00 2013 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 4 16:02:00 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9853473d |
| 7 |
|
| 8 |
sci-electronics/player: Bump EAPI to 5; Bump to python-single-r1 eclass |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
sci-electronics/player/ChangeLog | 5 ++++- |
| 14 |
sci-electronics/player/player-2.0.4.ebuild | 29 ++++++++++++++--------------- |
| 15 |
2 files changed, 18 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-electronics/player/ChangeLog b/sci-electronics/player/ChangeLog |
| 18 |
index 566013e..d9e7b1f 100644 |
| 19 |
--- a/sci-electronics/player/ChangeLog |
| 20 |
+++ b/sci-electronics/player/ChangeLog |
| 21 |
@@ -1,7 +1,10 @@ |
| 22 |
# ChangeLog for sci-electronics/player |
| 23 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 04 Dec 2013; Justin Lecher <jlec@g.o> player-2.0.4.ebuild: |
| 28 |
+ Bump EAPI to 5; Bump to python-single-r1 eclass |
| 29 |
+ |
| 30 |
14 Mar 2011; Justin Lecher <jlec@g.o> player-2.0.4.ebuild: |
| 31 |
Moved media-libs/jpeg -> virtual/jpeg |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-electronics/player/player-2.0.4.ebuild b/sci-electronics/player/player-2.0.4.ebuild |
| 35 |
index c123482..15be88a 100644 |
| 36 |
--- a/sci-electronics/player/player-2.0.4.ebuild |
| 37 |
+++ b/sci-electronics/player/player-2.0.4.ebuild |
| 38 |
@@ -1,12 +1,12 @@ |
| 39 |
-# Copyright 1999-2011 Gentoo Foundation |
| 40 |
+# Copyright 1999-2013 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
# $Header: $ |
| 43 |
|
| 44 |
-EAPI=1 |
| 45 |
+EAPI=5 |
| 46 |
|
| 47 |
-PYTHON_DEPEND="2" |
| 48 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
| 49 |
|
| 50 |
-inherit eutils python |
| 51 |
+inherit eutils python-single-r1 |
| 52 |
|
| 53 |
DESCRIPTION="A network server for robot control" |
| 54 |
HOMEPAGE="http://playerstage.sourceforge.net/index.php?src=player" |
| 55 |
@@ -54,10 +54,10 @@ DEPEND="${RDEPEND} |
| 56 |
doc? ( app-doc/doxygen )" |
| 57 |
|
| 58 |
pkg_setup () { |
| 59 |
- python_set_active_version 2 |
| 60 |
+ python-single-r1_pkg_setup |
| 61 |
} |
| 62 |
|
| 63 |
-src_compile() { |
| 64 |
+src_configure() { |
| 65 |
local drivers driver nodep_drivers |
| 66 |
|
| 67 |
nodep_drivers="acoustics acts amcl amtecpowercube |
| 68 |
@@ -96,25 +96,24 @@ src_compile() { |
| 69 |
$(use_enable test tests) \ |
| 70 |
--with-playercc \ |
| 71 |
${drivers} |
| 72 |
+} |
| 73 |
|
| 74 |
+src_compile() { |
| 75 |
# Parallel make will fail |
| 76 |
- emake -j1 || die "emake failed" |
| 77 |
+ emake -j1 |
| 78 |
|
| 79 |
if use doc; then |
| 80 |
- pushd doc > /dev/null |
| 81 |
- emake doc || die "emake doc failed" |
| 82 |
- popd > /dev/null |
| 83 |
+ cd doc || die |
| 84 |
+ emake doc |
| 85 |
fi |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
| 89 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 90 |
+ default |
| 91 |
|
| 92 |
if use doc; then |
| 93 |
- cd doc |
| 94 |
- emake DESTDIR="${D}" doc-install || die "emake doc-install failed" |
| 95 |
- cd .. |
| 96 |
+ cd doc || die |
| 97 |
+ emake DESTDIR="${D}" doc-install |
| 98 |
fi |
| 99 |
|
| 100 |
- dodoc AUTHORS ChangeLog NEWS README TODO || die |
| 101 |
} |
Archives