Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
Date: Sat, 24 Jun 2017 02:17:06
Message-Id: 1498270610.9e4f0cd8ae716aebec9ccb92994bb79eb65221e1.kensington@gentoo
1 commit: 9e4f0cd8ae716aebec9ccb92994bb79eb65221e1
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 24 02:14:31 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 24 02:16:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4f0cd8
7
8 net-p2p/amule: remove old
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-p2p/amule/Manifest | 1 -
13 net-p2p/amule/amule-2.3.1.ebuild | 106 ----------------------------
14 net-p2p/amule/files/amule-2.3.1-gcc47.patch | 21 ------
15 3 files changed, 128 deletions(-)
16
17 diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
18 index 2503136cb44..bca0d5c4d74 100644
19 --- a/net-p2p/amule/Manifest
20 +++ b/net-p2p/amule/Manifest
21 @@ -1,2 +1 @@
22 -DIST aMule-2.3.1.tar.bz2 4565232 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d SHA512 3310aa6e92dde0e27df032da701bc28533c703277ddeec3766fb0e945725ed340b2d3fe54016172621a47559b6c13fb2893cba0d2469a1038ab35c3ee2d5a3c3 WHIRLPOOL 1e1a27ebaed1c8f49093dc6a75a0b9c5fd1ad5a3390585d08b1db2b8cd00397e2d519b01720d5d2131b779f9bc0137d9a6aba603117295b185c3db716cc7dba2
23 DIST aMule-2.3.2.tar.xz 3895300 SHA256 f64720fdc8c6cfa06bdcd4ca3922d30a0ddddba9c897f5bec7605009c7683928 SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016 WHIRLPOOL 2907069f705dcb438fb78e049d9a417d42401bff659924c7ed66451b22c6dd35baf52e8100ca81e06c24cd1418ba586e16746bcb4e27314c15fd29407b4e3298
24
25 diff --git a/net-p2p/amule/amule-2.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
26 deleted file mode 100644
27 index 528912006a8..00000000000
28 --- a/net-p2p/amule/amule-2.3.1.ebuild
29 +++ /dev/null
30 @@ -1,106 +0,0 @@
31 -# Copyright 1999-2015 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI="2"
35 -
36 -inherit eutils flag-o-matic wxwidgets user
37 -
38 -MY_P=${PN/m/M}-${PV}
39 -S="${WORKDIR}"/${MY_P}
40 -
41 -DESCRIPTION="aMule, the all-platform eMule p2p client"
42 -HOMEPAGE="http://www.amule.org/"
43 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
48 -IUSE="daemon debug geoip nls remote stats unicode upnp +X"
49 -
50 -DEPEND=">=dev-libs/crypto++-5
51 - >=sys-libs/zlib-1.2.1
52 - stats? ( >=media-libs/gd-2.0.26[jpeg] )
53 - geoip? ( dev-libs/geoip )
54 - upnp? ( >=net-libs/libupnp-1.6.6 )
55 - remote? ( >=media-libs/libpng-1.2.0
56 - unicode? ( >=media-libs/gd-2.0.26 ) )
57 - X? ( >=x11-libs/wxGTK-2.8.12:2.8[X] )
58 - !X? ( >=x11-libs/wxGTK-2.8.12:2.8 )
59 - !net-p2p/imule"
60 -RDEPEND="${DEPEND}"
61 -
62 -pkg_setup() {
63 - if use stats && ! use X; then
64 - einfo "Note: You would need both the X and stats USE flags"
65 - einfo "to compile aMule Statistics GUI."
66 - einfo "I will now compile console versions only."
67 - fi
68 -}
69 -
70 -pkg_preinst() {
71 - if use daemon || use remote; then
72 - enewgroup p2p
73 - enewuser p2p -1 -1 /home/p2p p2p
74 - fi
75 -}
76 -
77 -src_prepare() {
78 - epatch "${FILESDIR}"/${PN}-2.2.6-fallocate.diff
79 - # Bug 412371
80 - epatch "${FILESDIR}"/${PN}-2.3.1-gcc47.patch
81 -}
82 -
83 -src_configure() {
84 - local myconf
85 -
86 - WX_GTK_VER="2.8"
87 -
88 - if use X; then
89 - einfo "wxGTK with X support will be used"
90 - need-wxwidgets unicode
91 - else
92 - einfo "wxGTK without X support will be used"
93 - need-wxwidgets base-unicode
94 - fi
95 -
96 - if use X ; then
97 - use stats && myconf="${myconf}
98 - --enable-wxcas
99 - --enable-alc"
100 - use remote && myconf="${myconf}
101 - --enable-amule-gui"
102 - else
103 - myconf="
104 - --disable-monolithic
105 - --disable-amule-gui
106 - --disable-wxcas
107 - --disable-alc"
108 - fi
109 -
110 - econf \
111 - --with-wx-config=${WX_CONFIG} \
112 - --enable-amulecmd \
113 - $(use_enable debug) \
114 - $(use_enable !debug optimize) \
115 - $(use_enable daemon amule-daemon) \
116 - $(use_enable geoip) \
117 - $(use_enable nls) \
118 - $(use_enable remote webserver) \
119 - $(use_enable stats cas) \
120 - $(use_enable stats alcc) \
121 - $(use_enable upnp) \
122 - ${myconf} || die
123 -}
124 -
125 -src_install() {
126 - emake DESTDIR="${D}" install || die
127 -
128 - if use daemon; then
129 - newconfd "${FILESDIR}"/amuled.confd amuled
130 - newinitd "${FILESDIR}"/amuled.initd amuled
131 - fi
132 - if use remote; then
133 - newconfd "${FILESDIR}"/amuleweb.confd amuleweb
134 - newinitd "${FILESDIR}"/amuleweb.initd amuleweb
135 - fi
136 -}
137
138 diff --git a/net-p2p/amule/files/amule-2.3.1-gcc47.patch b/net-p2p/amule/files/amule-2.3.1-gcc47.patch
139 deleted file mode 100644
140 index e776dda3240..00000000000
141 --- a/net-p2p/amule/files/amule-2.3.1-gcc47.patch
142 +++ /dev/null
143 @@ -1,21 +0,0 @@
144 -# http://code.google.com/p/amule/source/detail?r=10772
145 -diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
146 ---- aMule-2.3.1.orig//src/ObservableQueue.h 2012-04-22 19:40:05.560084120 +0200
147 -+++ aMule-2.3.1/src/ObservableQueue.h 2012-04-22 19:40:32.479085322 +0200
148 -@@ -331,14 +331,14 @@
149 - template <typename ValueType>
150 - void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
151 - {
152 -- NotifyObservers( EventType( EventType::STARTING ), o );
153 -+ this->NotifyObservers( EventType( EventType::STARTING ), o );
154 - }
155 -
156 -
157 - template <typename ValueType>
158 - void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
159 - {
160 -- NotifyObservers( EventType( EventType::STOPPING ), o );
161 -+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
162 - }
163 -
164 -
165 \ No newline at end of file