1 |
commit: 3360cea4a297c59e3983f29ee2f370300cfcb2d0 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 27 02:18:52 2017 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 27 02:18:52 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3360cea4 |
7 |
|
8 |
net-p2p/amule: new revision to fix media-libs/gd USE dependency. |
9 |
|
10 |
With USE=stats, amule needs gd to be built with PNG support. There was |
11 |
already a USE dependency for JPEG support, and this revision adds it |
12 |
for PNG, too. |
13 |
|
14 |
Gentoo-Bug: 612386 |
15 |
|
16 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
17 |
|
18 |
.../{amule-2.3.2.ebuild => amule-2.3.2-r1.ebuild} | 30 ++++++++++------------ |
19 |
1 file changed, 14 insertions(+), 16 deletions(-) |
20 |
|
21 |
diff --git a/net-p2p/amule/amule-2.3.2.ebuild b/net-p2p/amule/amule-2.3.2-r1.ebuild |
22 |
similarity index 82% |
23 |
rename from net-p2p/amule/amule-2.3.2.ebuild |
24 |
rename to net-p2p/amule/amule-2.3.2-r1.ebuild |
25 |
index d188432fea0..06bb5d1e707 100644 |
26 |
--- a/net-p2p/amule/amule-2.3.2.ebuild |
27 |
+++ b/net-p2p/amule/amule-2.3.2-r1.ebuild |
28 |
@@ -1,4 +1,4 @@ |
29 |
-# Copyright 1999-2016 Gentoo Foundation |
30 |
+# Copyright 1999-2017 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
EAPI=6 |
34 |
@@ -6,8 +6,8 @@ WX_GTK_VER="3.0" |
35 |
|
36 |
inherit wxwidgets user |
37 |
|
38 |
-MY_P=${PN/m/M}-${PV} |
39 |
-S="${WORKDIR}"/${MY_P} |
40 |
+MY_P="${PN/m/M}-${PV}" |
41 |
+S="${WORKDIR}/${MY_P}" |
42 |
|
43 |
DESCRIPTION="aMule, the all-platform eMule p2p client" |
44 |
HOMEPAGE="http://www.amule.org/" |
45 |
@@ -18,23 +18,21 @@ SLOT="0" |
46 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
47 |
IUSE="daemon debug geoip nls remote stats unicode upnp +X" |
48 |
|
49 |
-DEPEND=" |
50 |
- >=dev-libs/crypto++-5 |
51 |
+COMMON_DEPEND=" |
52 |
+ dev-libs/crypto++ |
53 |
sys-libs/binutils-libs:0= |
54 |
- >=sys-libs/zlib-1.2.1 |
55 |
+ sys-libs/zlib |
56 |
x11-libs/wxGTK:${WX_GTK_VER}[X?] |
57 |
- stats? ( >=media-libs/gd-2.0.26:=[jpeg] ) |
58 |
+ stats? ( media-libs/gd:=[jpeg,png] ) |
59 |
geoip? ( dev-libs/geoip ) |
60 |
- upnp? ( >=net-libs/libupnp-1.6.6 ) |
61 |
- remote? ( >=media-libs/libpng-1.2.0:0= |
62 |
- unicode? ( >=media-libs/gd-2.0.26:= ) ) |
63 |
- !net-p2p/imule |
64 |
-" |
65 |
-RDEPEND="${DEPEND}" |
66 |
+ upnp? ( net-libs/libupnp:* ) |
67 |
+ remote? ( media-libs/libpng:0= |
68 |
+ unicode? ( media-libs/gd:= ) ) |
69 |
+ !net-p2p/imule" |
70 |
+DEPEND="${COMMON_DEPEND}" |
71 |
+RDEPEND="${COMMON_DEPEND}" |
72 |
|
73 |
-PATCHES=( |
74 |
- "${FILESDIR}"/${PN}-2.2.6-fallocate.diff |
75 |
-) |
76 |
+PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" ) |
77 |
|
78 |
pkg_setup() { |
79 |
if use stats && ! use X; then |