[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: c7d1e42950960a4cea26c5cd727dc3f40b45d6de
Author: Alexander Tsoy tsoy me>
AuthorDate: Sun Jun 20 18:25:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 21 22:26:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d1e429
net-p2p/amule: Remove old
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/21348
Signed-off-by: Sam James gentoo.org>
net-p2p/amule/Manifest | 1 -
net-p2p/amule/amule-2.3.2-r5.ebuild| 155 -
...le-2.3.2-Fixed-compilation-with-newer-bfd.patch | 33 --
net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch | 25 --
.../amule/files/amule-2.3.2-desktop-mimetype.patch | 30 --
...2.3.2-fix-crash-closing-last-search-tab-1.patch | 97 --
...2.3.2-fix-crash-closing-last-search-tab-2.patch | 159 --
.../amule-2.3.2-fix-crash-shared-dir-utf8.patch| 78 -
...2.3.2-fix-crash-when-shared-files-changed.patch | 50 ---
net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch | 24 --
net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch | 350 -
net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch | 263
12 files changed, 1265 deletions(-)
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 83f4b988336..0b9d01e1aa4 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,2 +1 @@
-DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B
cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a
SHA512
3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B
4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b
SHA512
a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e
diff --git a/net-p2p/amule/amule-2.3.2-r5.ebuild
b/net-p2p/amule/amule-2.3.2-r5.ebuild
deleted file mode 100644
index 30856b93017..000
--- a/net-p2p/amule/amule-2.3.2-r5.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit wxwidgets xdg-utils
-
-if [[ ${PV} == ]] ; then
- EGIT_REPO_URI="https://github.com/amule-project/amule;
- inherit autotools git-r3
-else
- MY_P="${PN/m/M}-${PV}"
- SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz;
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/;
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="daemon debug geoip nls remote stats upnp +X"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/crypto++:=
- sys-libs/binutils-libs:0=
- sys-libs/readline:0=
- sys-libs/zlib
- >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
- daemon? ( acct-user/amule )
- geoip? ( dev-libs/geoip )
- nls? ( virtual/libintl )
- remote? (
- acct-user/amule
- media-libs/libpng:0=
- )
- stats? ( media-libs/gd:=[jpeg,png] )
- upnp? ( net-libs/libupnp:0 )
-"
-DEPEND="${RDEPEND}
- X? ( dev-util/desktop-file-utils )
-"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
- "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
- "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
- "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
- "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
- "${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
- "${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
- "${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
- "${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
- "${FILESDIR}/${PN}-2.3.2-desktop-mimetype.patch"
- "${FILESDIR}/${PN}-2.3.2-libupnp-1.14.patch"
-)
-
-pkg_setup() {
- setup-wxwidgets
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]]; then
- ./autogen.sh || die
- fi
-}
-
-src_configure() {
- local myconf=(
- --with-denoise-level=0
- --with-wx-config="${WX_CONFIG}"
- --enable-amulecmd
- --with-boost
- $(use_enable debug)
- $(use_enable daemon amule-daemon)
- $(use_enable geoip)
- $(use_enable nls)
- $(use_enable remote webserver)
- $(use_enable stats cas)
- $(use_enable stats alcc)
- $(use_enable upnp)
- )
-
- if use
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 4dc57685e11b9b63789f531bf7414e23a84a9a25
Author: Hanno Böck gentoo org>
AuthorDate: Thu Sep 3 11:40:49 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Thu Sep 3 11:40:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc57685
net-p2p/amule: Fix compilation with libupnp 1.14.
Patch includes 2 upstream commits.
Closes: https://bugs.gentoo.org/740196
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-3.0.5, Repoman-3.0.1
net-p2p/amule/amule-2.3.2-r5.ebuild| 1 +
net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch | 24 ++
2 files changed, 25 insertions(+)
diff --git a/net-p2p/amule/amule-2.3.2-r5.ebuild
b/net-p2p/amule/amule-2.3.2-r5.ebuild
index c35014cef8c..30856b93017 100644
--- a/net-p2p/amule/amule-2.3.2-r5.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r5.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
"${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
"${FILESDIR}/${PN}-2.3.2-desktop-mimetype.patch"
+ "${FILESDIR}/${PN}-2.3.2-libupnp-1.14.patch"
)
pkg_setup() {
diff --git a/net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch
b/net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch
new file mode 100644
index 000..d68e4776e0a
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch
@@ -0,0 +1,24 @@
+--- a/src/UPnPBase.cpp 2016-09-16 09:55:07.0 +0200
b/src/UPnPBase.cpp 2020-09-03 12:37:43.861231093 +0200
+@@ -824,13 +824,17 @@ m_WanService(NULL)
+ // Null string at first
+ std::ostringstream msg;
+
++ // Declare those here to avoid
++ // "jump to label ‘error’ [-fpermissive] crosses initialization
++ // of ‘char* ipAddress’"
++ unsigned short port;
++ char *ipAddress;
++
+ // Start UPnP
+ int ret;
+- char *ipAddress = NULL;
+- unsigned short port = 0;
+- ret = UpnpInit(ipAddress, udpPort);
++ ret = UpnpInit2(0, udpPort);
+ if (ret != UPNP_E_SUCCESS) {
+- msg << "error(UpnpInit): Error code ";
++ msg << "error(UpnpInit2): Error code ";
+ goto error;
+ }
+ port = UpnpGetServerPort();
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 15e3808326e878e43468463d42465798bd263be8
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Jun 15 15:23:32 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Jun 20 20:30:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e38083
net-p2p/amule: Remove old revision
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/16261
Signed-off-by: Thomas Deutschmann gentoo.org>
net-p2p/amule/amule-2.3.2-r2.ebuild | 104
net-p2p/amule/files/amuled.confd| 12 -
net-p2p/amule/files/amuleweb.confd | 27 --
3 files changed, 143 deletions(-)
diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild
b/net-p2p/amule/amule-2.3.2-r2.ebuild
deleted file mode 100644
index d94a14893ec..000
--- a/net-p2p/amule/amule-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit wxwidgets user
-
-MY_P="${PN/m/M}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip nls remote stats upnp +X"
-
-COMMON_DEPEND="
- dev-libs/boost:=
- dev-libs/crypto++:=
- sys-libs/binutils-libs:0=
- sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[X?]
- stats? ( media-libs/gd:=[jpeg,png] )
- geoip? ( dev-libs/geoip )
- upnp? ( net-libs/libupnp:* )
- remote? ( media-libs/libpng:0= )
- !net-p2p/imule"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
- "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
- "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
- "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
- "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
-)
-
-pkg_setup() {
- if use stats && ! use X; then
- einfo "Note: You would need both the X and stats USE flags"
- einfo "to compile aMule Statistics GUI."
- einfo "I will now compile console versions only."
- fi
-
- setup-wxwidgets
-}
-
-pkg_preinst() {
- if use daemon || use remote; then
- enewgroup p2p
- enewuser p2p -1 -1 /home/p2p p2p
- fi
-}
-
-src_configure() {
- local myconf
-
- if use X; then
- use stats && myconf="${myconf}
- --enable-wxcas
- --enable-alc"
- use remote && myconf="${myconf}
- --enable-amule-gui"
- else
- myconf="
- --disable-monolithic
- --disable-amule-gui
- --disable-wxcas
- --disable-alc"
- fi
-
- econf \
- --with-denoise-level=0 \
- --with-wx-config="${WX_CONFIG}" \
- --enable-amulecmd \
- --with-boost \
- $(use_enable debug) \
- $(use_enable daemon amule-daemon) \
- $(use_enable geoip) \
- $(use_enable nls) \
- $(use_enable remote webserver) \
- $(use_enable stats cas) \
- $(use_enable stats alcc) \
- $(use_enable upnp) \
- ${myconf}
-}
-
-src_install() {
- default
-
- if use daemon; then
- newconfd "${FILESDIR}"/amuled.confd amuled
- newinitd "${FILESDIR}"/amuled.initd amuled
- fi
- if use remote; then
- newconfd "${FILESDIR}"/amuleweb.confd amuleweb
- newinitd "${FILESDIR}"/amuleweb.initd amuleweb
- fi
-}
diff --git a/net-p2p/amule/files/amuled.confd b/net-p2p/amule/files/amuled.confd
deleted file mode 100644
index fbf2a2b..000
--- a/net-p2p/amule/files/amuled.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# owner of amuled process (must be existing)
-AMULEUSER="p2p"
-
-# home directory for amuled (must be existing)
-AMULEHOME="/home/p2p"
-
-# log file (/dev/null for nowhere)
-LOG=/var/log/amuled.log
-
diff --git a/net-p2p/amule/files/amuleweb.confd
b/net-p2p/amule/files/amuleweb.confd
deleted file mode 100644
index 29a3ea62475..000
--- a/net-p2p/amule/files/amuleweb.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# owner of amuleweb process (must be existing)
-AMULEUSER="p2p"
-
-# home directory for amuleweb (from where to read configuration) (must be
existing)
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 2912503476a06505e0575648bdc85e1238ed17fd
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Feb 3 07:56:57 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 20 13:17:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29125034
net-p2p/amule: fix build with binutils-2.34
Closes: https://bugs.gentoo.org/707884
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/amule/amule-2.3.2-r4.ebuild| 1 +
...le-2.3.2-Fixed-compilation-with-newer-bfd.patch | 33 ++
2 files changed, 34 insertions(+)
diff --git a/net-p2p/amule/amule-2.3.2-r4.ebuild
b/net-p2p/amule/amule-2.3.2-r4.ebuild
index 8199a8471f0..eee88909130 100644
--- a/net-p2p/amule/amule-2.3.2-r4.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r4.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
"${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
"${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
+ "${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
)
pkg_setup() {
diff --git
a/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
new file mode 100644
index 000..3ef8a21fa45
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
@@ -0,0 +1,33 @@
+From c0c28234a40b1b575ce51cdfe5ffa5dac3a7494c Mon Sep 17 00:00:00 2001
+From: Werner Mahr
+Date: Fri, 31 Jan 2020 17:55:24 +0100
+Subject: [PATCH] Fixed compilation with newer bfd. Fixes: #174
+
+---
+ src/libs/common/MuleDebug.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
+index 5d8d75890..0ebf2ab07 100644
+--- a/src/libs/common/MuleDebug.cpp
b/src/libs/common/MuleDebug.cpp
+@@ -268,14 +268,14 @@ void get_file_line_info(bfd *abfd, asection *section,
void* _address)
+ return;
+ }
+
+- bfd_vma vma = bfd_get_section_vma(abfd, section);
++ bfd_vma vma = section->vma;
+
+ unsigned long address = (unsigned long)_address;
+ if (address < vma) {
+ return;
+ }
+
+- bfd_size_type size = bfd_section_size(abfd, section);
++ bfd_size_type size = section->size;
+ if (address > (vma + size)) {
+ return;
+ }
+--
+2.24.1
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 34130dbd1646b428aa766cb957629ed6e7c270cb
Author: Alexander Tsoy tsoy me>
AuthorDate: Sat Aug 10 01:01:18 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Jan 17 06:23:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34130dbd
net-p2p/amule: EAPI=7 bump
* add missing pkgconfig dependency
* convert myconf variable to array
* remove obsolete imule blocker
* fix license
* fix build with >=net-libs/libupnp-1.8
* switch to acct-{user,group}
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/amule/amule-2.3.2-r4.ebuild | 126
net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch | 350 ++
net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch | 263
net-p2p/amule/files/amuled.confd-r1 | 9 +
net-p2p/amule/files/amuleweb.confd-r1 | 24 ++
5 files changed, 772 insertions(+)
diff --git a/net-p2p/amule/amule-2.3.2-r4.ebuild
b/net-p2p/amule/amule-2.3.2-r4.ebuild
new file mode 100644
index 000..8199a8471f0
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.2-r4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets
+
+MY_P="${PN/m/M}-${PV}"
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/;
+SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats upnp +X"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/crypto++:=
+ sys-libs/binutils-libs:0=
+ sys-libs/zlib
+ >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
+ daemon? ( acct-user/amule )
+ geoip? ( dev-libs/geoip )
+ remote? (
+ acct-user/amule
+ media-libs/libpng:0=
+ )
+ stats? ( media-libs/gd:=[jpeg,png] )
+ upnp? ( net-libs/libupnp:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
+ "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
+ "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
+ "${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
+ "${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
+)
+
+pkg_setup() {
+ setup-wxwidgets
+}
+
+src_configure() {
+ local myconf=(
+ --with-denoise-level=0
+ --with-wx-config="${WX_CONFIG}"
+ --enable-amulecmd
+ --with-boost
+ $(use_enable debug)
+ $(use_enable daemon amule-daemon)
+ $(use_enable geoip)
+ $(use_enable nls)
+ $(use_enable remote webserver)
+ $(use_enable stats cas)
+ $(use_enable stats alcc)
+ $(use_enable upnp)
+ )
+
+ if use X; then
+ myconf+=(
+ $(use_enable remote amule-gui)
+ $(use_enable stats alc)
+ $(use_enable stats wxcas)
+ )
+ else
+ myconf+=(
+ --disable-monolithic
+ --disable-amule-gui
+ --disable-alc
+ --disable-wxcas
+ )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ if use daemon; then
+ newconfd "${FILESDIR}"/amuled.confd-r1 amuled
+ newinitd "${FILESDIR}"/amuled.initd amuled
+ fi
+ if use remote; then
+ newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb
+ newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+ fi
+
+ if use daemon || use remote; then
+ keepdir /var/lib/${PN}
+ fowners amule:amule /var/lib/${PN}
+ fperms 0750 /var/lib/${PN}
+ fi
+}
+
+pkg_postinst() {
+ local ver
+
+ if use daemon || use remote; then
+ for ver in ${REPLACING_VERSIONS}; do
+ if ver_test ${ver} -lt "2.3.2-r4"; then
+ elog "Default user under which amuled and
amuleweb daemons are started"
+ elog "have been changed from p2p to amule.
Default home directory have been"
+ elog "changed as well."
+ echo
+ elog "If you want to preserve old
download/share location, you can create"
+ elog "symlink /var/lib/amule/.aMule pointing to
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 8875451f5ad348eccdf92ea47136b791be2bb599
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Apr 15 20:55:15 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Apr 22 07:26:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8875451f
net-p2p/amule: revbump for wxGTK:3.0-gtk3
Add upstream patch fixing crashes with wxGTK:3.0-gtk3.
Also fix configure logic.
Signed-off-by: Alexander Tsoy tsoy.me>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michał Górny gentoo.org>
net-p2p/amule/amule-2.3.2-r3.ebuild| 106 +
...2.3.2-fix-crash-when-shared-files-changed.patch | 50 ++
2 files changed, 156 insertions(+)
diff --git a/net-p2p/amule/amule-2.3.2-r3.ebuild
b/net-p2p/amule/amule-2.3.2-r3.ebuild
new file mode 100644
index 000..7a7035ef43e
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.2-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets user
+
+MY_P="${PN/m/M}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats upnp +X"
+
+COMMON_DEPEND="
+ dev-libs/boost:=
+ dev-libs/crypto++:=
+ sys-libs/binutils-libs:0=
+ sys-libs/zlib
+ >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
+ stats? ( media-libs/gd:=[jpeg,png] )
+ geoip? ( dev-libs/geoip )
+ upnp? ( net-libs/libupnp:* )
+ remote? ( media-libs/libpng:0= )
+ !net-p2p/imule"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
+ "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
+ "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
+)
+
+pkg_setup() {
+ if use stats && ! use X; then
+ einfo "Note: You would need both the X and stats USE flags"
+ einfo "to compile aMule Statistics GUI."
+ einfo "I will now compile console versions only."
+ fi
+
+ setup-wxwidgets
+}
+
+pkg_preinst() {
+ if use daemon || use remote; then
+ enewgroup p2p
+ enewuser p2p -1 -1 /home/p2p p2p
+ fi
+}
+
+src_configure() {
+ local myconf
+
+ if use X; then
+ myconf="
+ $(use_enable remote amule-gui)
+ $(use_enable stats alc)
+ $(use_enable stats wxcas)
+ "
+ else
+ myconf="
+ --disable-monolithic
+ --disable-amule-gui
+ --disable-alc
+ --disable-wxcas
+ "
+ fi
+
+ econf \
+ --with-denoise-level=0 \
+ --with-wx-config="${WX_CONFIG}" \
+ --enable-amulecmd \
+ --with-boost \
+ $(use_enable debug) \
+ $(use_enable daemon amule-daemon) \
+ $(use_enable geoip) \
+ $(use_enable nls) \
+ $(use_enable remote webserver) \
+ $(use_enable stats cas) \
+ $(use_enable stats alcc) \
+ $(use_enable upnp) \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ if use daemon; then
+ newconfd "${FILESDIR}"/amuled.confd amuled
+ newinitd "${FILESDIR}"/amuled.initd amuled
+ fi
+ if use remote; then
+ newconfd "${FILESDIR}"/amuleweb.confd amuleweb
+ newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+ fi
+}
diff --git
a/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch
b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch
new file mode 100644
index 000..81e0ef7b629
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch
@@ -0,0 +1,50 @@
+From 110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 Mon Sep 17 00:00:00 2001
+From: xinhuang
+Date: Thu, 4 Jan 2018 00:44:35 -0800
+Subject: [PATCH] fix crash when shared files changed on Shared files tab
+
+---
+ src/extern/wxWidgets/listctrl.cpp | 10 --
+ src/extern/wxWidgets/listctrl.h | 5 -
+ 2 files changed, 15 deletions(-)
+
+diff --git a/src/extern/wxWidgets/listctrl.cpp
b/src/extern/wxWidgets/listctrl.cpp
+index 18a30f205..460700691 100644
+--- a/src/extern/wxWidgets/listctrl.cpp
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: e8dc99ed1e5f679d13ff5ecd1926bbb23d6a7dea
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Apr 15 20:58:34 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Apr 22 07:26:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8dc99ed
net-p2p/amule: remove old and broken
Signed-off-by: Alexander Tsoy tsoy.me>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/11702
Signed-off-by: Michał Górny gentoo.org>
net-p2p/amule/amule-2.3.2-r1.ebuild| 104 -
net-p2p/amule/files/amule-2.2.6-fallocate.diff | 23 --
2 files changed, 127 deletions(-)
diff --git a/net-p2p/amule/amule-2.3.2-r1.ebuild
b/net-p2p/amule/amule-2.3.2-r1.ebuild
deleted file mode 100644
index 51bb5d2472b..000
--- a/net-p2p/amule/amule-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit wxwidgets user
-
-MY_P="${PN/m/M}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip nls remote stats unicode upnp +X"
-
-COMMON_DEPEND="
- dev-libs/crypto++
- sys-libs/binutils-libs:0=
- sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[X?]
- stats? ( media-libs/gd:=[jpeg,png] )
- geoip? ( dev-libs/geoip )
- upnp? ( net-libs/libupnp:* )
- remote? ( media-libs/libpng:0=
- unicode? ( media-libs/gd:= ) )
- !net-p2p/imule"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" )
-
-pkg_setup() {
- if use stats && ! use X; then
- einfo "Note: You would need both the X and stats USE flags"
- einfo "to compile aMule Statistics GUI."
- einfo "I will now compile console versions only."
- fi
-}
-
-pkg_preinst() {
- if use daemon || use remote; then
- enewgroup p2p
- enewuser p2p -1 -1 /home/p2p p2p
- fi
-}
-
-src_configure() {
- local myconf
-
- if use X; then
- einfo "wxGTK with X support will be used"
- need-wxwidgets unicode
- else
- einfo "wxGTK without X support will be used"
- need-wxwidgets base-unicode
- fi
-
- if use X ; then
- use stats && myconf="${myconf}
- --enable-wxcas
- --enable-alc"
- use remote && myconf="${myconf}
- --enable-amule-gui"
- else
- myconf="
- --disable-monolithic
- --disable-amule-gui
- --disable-wxcas
- --disable-alc"
- fi
-
- econf \
- --with-denoise-level=0 \
- --with-wx-config="${WX_CONFIG}" \
- --enable-amulecmd \
- --without-boost \
- $(use_enable debug) \
- $(use_enable daemon amule-daemon) \
- $(use_enable geoip) \
- $(use_enable nls) \
- $(use_enable remote webserver) \
- $(use_enable stats cas) \
- $(use_enable stats alcc) \
- $(use_enable upnp) \
- ${myconf}
-}
-
-src_install() {
- default
-
- if use daemon; then
- newconfd "${FILESDIR}"/amuled.confd amuled
- newinitd "${FILESDIR}"/amuled.initd amuled
- fi
- if use remote; then
- newconfd "${FILESDIR}"/amuleweb.confd amuleweb
- newinitd "${FILESDIR}"/amuleweb.initd amuleweb
- fi
-}
diff --git a/net-p2p/amule/files/amule-2.2.6-fallocate.diff
b/net-p2p/amule/files/amule-2.2.6-fallocate.diff
deleted file mode 100644
index 8d1485a6778..000
--- a/net-p2p/amule/files/amule-2.2.6-fallocate.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Disable fallocate #562992
-
-This is only a workaround to fix FTBFS, the configure check is wrong and needs
to be fixed:
-http://www.amule.org/abugs/view.php?id=1572
-
a/src/ThreadTasks.cpp
-+++ b/src/ThreadTasks.cpp
-@@ -506,6 +506,15 @@ void CCompletionTask::OnExit()
- #include
- #include
-
-+// #562992
-+#if defined(__alpha__) || defined(__hppa__)
-+#undef HAVE_FALLOCATE
-+#endif
-+
-+#if defined(__hppa__)
-+#undef HAVE_SYS_FALLOCATE
-+#endif
-+
- CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause)
- // GetPrintable is used to improve the readability of the log.
- : CThreadTask(wxT("Allocating"),
file->GetFullName().RemoveExt().GetPrintable(), ETP_High),
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 9e4f0cd8ae716aebec9ccb92994bb79eb65221e1
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Jun 24 02:14:31 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Jun 24 02:16:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4f0cd8
net-p2p/amule: remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-p2p/amule/Manifest | 1 -
net-p2p/amule/amule-2.3.1.ebuild| 106
net-p2p/amule/files/amule-2.3.1-gcc47.patch | 21 --
3 files changed, 128 deletions(-)
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 2503136cb44..bca0d5c4d74 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,2 +1 @@
-DIST aMule-2.3.1.tar.bz2 4565232 SHA256
d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d SHA512
3310aa6e92dde0e27df032da701bc28533c703277ddeec3766fb0e945725ed340b2d3fe54016172621a47559b6c13fb2893cba0d2469a1038ab35c3ee2d5a3c3
WHIRLPOOL
1e1a27ebaed1c8f49093dc6a75a0b9c5fd1ad5a3390585d08b1db2b8cd00397e2d519b01720d5d2131b779f9bc0137d9a6aba603117295b185c3db716cc7dba2
DIST aMule-2.3.2.tar.xz 3895300 SHA256
f64720fdc8c6cfa06bdcd4ca3922d30a0ba9c897f5bec7605009c7683928 SHA512
3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
WHIRLPOOL
2907069f705dcb438fb78e049d9a417d42401bff659924c7ed66451b22c6dd35baf52e8100ca81e06c24cd1418ba586e16746bcb4e27314c15fd29407b4e3298
diff --git a/net-p2p/amule/amule-2.3.1.ebuild b/net-p2p/amule/amule-2.3.1.ebuild
deleted file mode 100644
index 528912006a8..000
--- a/net-p2p/amule/amule-2.3.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic wxwidgets user
-
-MY_P=${PN/m/M}-${PV}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="aMule, the all-platform eMule p2p client"
-HOMEPAGE="http://www.amule.org/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip nls remote stats unicode upnp +X"
-
-DEPEND=">=dev-libs/crypto++-5
- >=sys-libs/zlib-1.2.1
- stats? ( >=media-libs/gd-2.0.26[jpeg] )
- geoip? ( dev-libs/geoip )
- upnp? ( >=net-libs/libupnp-1.6.6 )
- remote? ( >=media-libs/libpng-1.2.0
- unicode? ( >=media-libs/gd-2.0.26 ) )
- X? ( >=x11-libs/wxGTK-2.8.12:2.8[X] )
- !X? ( >=x11-libs/wxGTK-2.8.12:2.8 )
- !net-p2p/imule"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if use stats && ! use X; then
- einfo "Note: You would need both the X and stats USE flags"
- einfo "to compile aMule Statistics GUI."
- einfo "I will now compile console versions only."
- fi
-}
-
-pkg_preinst() {
- if use daemon || use remote; then
- enewgroup p2p
- enewuser p2p -1 -1 /home/p2p p2p
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.2.6-fallocate.diff
- # Bug 412371
- epatch "${FILESDIR}"/${PN}-2.3.1-gcc47.patch
-}
-
-src_configure() {
- local myconf
-
- WX_GTK_VER="2.8"
-
- if use X; then
- einfo "wxGTK with X support will be used"
- need-wxwidgets unicode
- else
- einfo "wxGTK without X support will be used"
- need-wxwidgets base-unicode
- fi
-
- if use X ; then
- use stats && myconf="${myconf}
- --enable-wxcas
- --enable-alc"
- use remote && myconf="${myconf}
- --enable-amule-gui"
- else
- myconf="
- --disable-monolithic
- --disable-amule-gui
- --disable-wxcas
- --disable-alc"
- fi
-
- econf \
- --with-wx-config=${WX_CONFIG} \
- --enable-amulecmd \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- $(use_enable daemon amule-daemon) \
- $(use_enable geoip) \
- $(use_enable nls) \
- $(use_enable remote webserver) \
- $(use_enable stats cas) \
- $(use_enable stats alcc) \
- $(use_enable upnp) \
- ${myconf} || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- if use daemon; then
- newconfd "${FILESDIR}"/amuled.confd amuled
- newinitd "${FILESDIR}"/amuled.initd amuled
- fi
- if use remote; then
- newconfd "${FILESDIR}"/amuleweb.confd amuleweb
- newinitd "${FILESDIR}"/amuleweb.initd amuleweb
- fi
-}
diff --git a/net-p2p/amule/files/amule-2.3.1-gcc47.patch
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/
commit: 46c19a04bc452de7101319de04913d533d3f5e30
Author: Austin English gentoo org>
AuthorDate: Tue May 3 17:18:45 2016 +
Commit: Austin English gentoo org>
CommitDate: Tue May 3 17:21:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c19a04
net-p2p/amule: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/573846
Package-Manager: portage-2.2.26
net-p2p/amule/amule-2.3.1-r2.ebuild | 109
net-p2p/amule/files/amuled.initd| 4 +-
net-p2p/amule/files/amuleweb.initd | 4 +-
3 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/net-p2p/amule/amule-2.3.1-r2.ebuild
b/net-p2p/amule/amule-2.3.1-r2.ebuild
new file mode 100644
index 000..dceb2cd
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.1-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit wxwidgets user
+
+MY_P=${PN/m/M}-${PV}
+S="${WORKDIR}"/${MY_P}
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats unicode upnp +X"
+
+DEPEND=">=dev-libs/crypto++-5
+ sys-libs/binutils-libs:0=
+ >=sys-libs/zlib-1.2.1
+ >=x11-libs/wxGTK-2.8.12:2.8[X?]
+ stats? ( >=media-libs/gd-2.0.26:=[jpeg] )
+ geoip? ( dev-libs/geoip )
+ upnp? ( >=net-libs/libupnp-1.6.6 )
+ remote? ( >=media-libs/libpng-1.2.0:0=
+ unicode? ( >=media-libs/gd-2.0.26:= ) )
+ !net-p2p/imule"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if use stats && ! use X; then
+ einfo "Note: You would need both the X and stats USE flags"
+ einfo "to compile aMule Statistics GUI."
+ einfo "I will now compile console versions only."
+ fi
+}
+
+pkg_preinst() {
+ if use daemon || use remote; then
+ enewgroup p2p
+ enewuser p2p -1 -1 /home/p2p p2p
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-2.2.6-fallocate.diff
+ # Bug 412371
+ eapply "${FILESDIR}"/${PN}-2.3.1-gcc47.patch
+
+ default
+}
+
+src_configure() {
+ local myconf
+
+ WX_GTK_VER="2.8"
+
+ if use X; then
+ einfo "wxGTK with X support will be used"
+ need-wxwidgets unicode
+ else
+ einfo "wxGTK without X support will be used"
+ need-wxwidgets base-unicode
+ fi
+
+ if use X ; then
+ use stats && myconf="${myconf}
+ --enable-wxcas
+ --enable-alc"
+ use remote && myconf="${myconf}
+ --enable-amule-gui"
+ else
+ myconf="
+ --disable-monolithic
+ --disable-amule-gui
+ --disable-wxcas
+ --disable-alc"
+ fi
+
+ econf \
+ --with-denoise-level=0 \
+ --with-wx-config="${WX_CONFIG}" \
+ --enable-amulecmd \
+ $(use_enable debug) \
+ $(use_enable daemon amule-daemon) \
+ $(use_enable geoip) \
+ $(use_enable nls) \
+ $(use_enable remote webserver) \
+ $(use_enable stats cas) \
+ $(use_enable stats alcc) \
+ $(use_enable upnp) \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ if use daemon; then
+ newconfd "${FILESDIR}"/amuled.confd amuled
+ newinitd "${FILESDIR}"/amuled.initd amuled
+ fi
+ if use remote; then
+ newconfd "${FILESDIR}"/amuleweb.confd amuleweb
+ newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+ fi
+}
diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd
index 082e2ff..1c070e6 100644
--- a/net-p2p/amule/files/amuled.initd
+++ b/net-p2p/amule/files/amuled.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-p2p/amule/files/amuleweb.initd
b/net-p2p/amule/files/amuleweb.initd
index 05e7d9f..d091e2a 100644
--- a/net-p2p/amule/files/amuleweb.initd
+++ b/net-p2p/amule/files/amuleweb.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
