[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/, net-p2p/amule/files/
commit: a4a6f67841aa6aedf6cc17509c208783591f3731
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Dec 18 02:36:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 22 06:43:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a6f678
net-p2p/amule: port to wxGTK 3.2
Apply Debian patch with fixes for wxWidgets 3.2 compatibility
Thanks-to: ernsteiswuerfel mailbox.org>
Closes: https://bugs.gentoo.org/915906
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Sam James gentoo.org>
.../{amule-.ebuild => amule-2.3.3-r3.ebuild} | 12 +-
net-p2p/amule/amule-.ebuild| 11 +-
net-p2p/amule/files/amule-2.3.3-wx3.2.patch| 461 +
3 files changed, 474 insertions(+), 10 deletions(-)
diff --git a/net-p2p/amule/amule-.ebuild
b/net-p2p/amule/amule-2.3.3-r3.ebuild
similarity index 92%
copy from net-p2p/amule/amule-.ebuild
copy to net-p2p/amule/amule-2.3.3-r3.ebuild
index c1743eff2384..e982384b3612 100644
--- a/net-p2p/amule/amule-.ebuild
+++ b/net-p2p/amule/amule-2.3.3-r3.ebuild
@@ -2,18 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
-inherit flag-o-matic wxwidgets xdg-utils
+inherit autotools flag-o-matic wxwidgets xdg-utils
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://github.com/amule-project/amule;
- inherit autotools git-r3
+ inherit 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="aMule, the all-platform eMule p2p client"
@@ -29,7 +29,7 @@ RDEPEND="
sys-libs/binutils-libs:0=
sys-libs/readline:0=
sys-libs/zlib
- >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
daemon? ( acct-user/amule )
geoip? ( dev-libs/geoip )
nls? ( virtual/libintl )
@@ -52,7 +52,9 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
+ "${FILESDIR}/${P}-autoconf-2.70.patch"
"${FILESDIR}/${PN}-2.3.3-backport-pr368.patch"
+ "${FILESDIR}/${PN}-2.3.3-wx3.2.patch"
)
pkg_setup() {
diff --git a/net-p2p/amule/amule-.ebuild b/net-p2p/amule/amule-.ebuild
index c1743eff2384..3a74fe6369d0 100644
--- a/net-p2p/amule/amule-.ebuild
+++ b/net-p2p/amule/amule-.ebuild
@@ -2,18 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
-inherit flag-o-matic wxwidgets xdg-utils
+inherit autotools flag-o-matic wxwidgets xdg-utils
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://github.com/amule-project/amule;
- inherit autotools git-r3
+ inherit 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="aMule, the all-platform eMule p2p client"
@@ -29,7 +29,7 @@ RDEPEND="
sys-libs/binutils-libs:0=
sys-libs/readline:0=
sys-libs/zlib
- >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
daemon? ( acct-user/amule )
geoip? ( dev-libs/geoip )
nls? ( virtual/libintl )
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
"${FILESDIR}/${PN}-2.3.3-backport-pr368.patch"
+ "${FILESDIR}/${PN}-2.3.3-wx3.2.patch"
)
pkg_setup() {
diff --git a/net-p2p/amule/files/amule-2.3.3-wx3.2.patch
b/net-p2p/amule/files/amule-2.3.3-wx3.2.patch
new file mode 100644
index ..58590c60f2df
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.3-wx3.2.patch
@@ -0,0 +1,461 @@
+Description: Fixes for wxWidgets 3.2 compatibility
+ Largely based on patch from Mr Hyde in
+ https://github.com/amule-project/amule/pull/168
+Author: Olly Betts
+Bug: https://github.com/amule-project/amule/issues/340
+Bug-Debian: https://bugs.debian.org/1019841
+Forwarded: no
+Last-Update: 2023-01-09
+
+--- a/src/ColorFrameCtrl.cpp
b/src/ColorFrameCtrl.cpp
+@@ -61,7 +61,7 @@
+ /
+ void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour)
+ {
+- m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID));
++ m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour,
wxBRUSHSTYLE_SOLID));
+
+ Refresh(FALSE);
+ } // SetFrameColor
+@@ -70,7 +70,7 @@
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/, net-p2p/amule/files/
commit: 722a58cbadfca20fc9ba71ce09008a9fd7584848
Author: Alexander Tsoy tsoy me>
AuthorDate: Sun Jun 25 08:17:57 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 26 14:41:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722a58cb
net-p2p/amule: fix build w/ clang and boost-1.82
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://bugs.gentoo.org/907843
Closes: https://github.com/gentoo/gentoo/pull/31517
Signed-off-by: Sam James gentoo.org>
.../{amule-.ebuild => amule-2.3.3-r1.ebuild} | 9 ++-
net-p2p/amule/amule-.ebuild| 8 ++-
.../amule/files/amule-2.3.3-autoconf-2.70.patch| 28 ++
net-p2p/amule/metadata.xml | 1 +
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/net-p2p/amule/amule-.ebuild
b/net-p2p/amule/amule-2.3.3-r1.ebuild
similarity index 93%
copy from net-p2p/amule/amule-.ebuild
copy to net-p2p/amule/amule-2.3.3-r1.ebuild
index 392ddb148410..e5e37d05e9dc 100644
--- a/net-p2p/amule/amule-.ebuild
+++ b/net-p2p/amule/amule-2.3.3-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg-utils
+inherit autotools flag-o-matic wxwidgets xdg-utils
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://github.com/amule-project/amule;
@@ -45,12 +45,14 @@ DEPEND="${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
+ >=sys-devel/boost-m4-0.4_p20221019
nls? ( sys-devel/gettext )
"
PATCHES=(
"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
"${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
+ "${FILESDIR}/${P}-autoconf-2.70.patch"
)
pkg_setup() {
@@ -59,13 +61,18 @@ pkg_setup() {
src_prepare() {
default
+ rm m4/boost.m4 || die
if [[ ${PV} == ]]; then
./autogen.sh || die
+ else
+ eautoreconf
fi
}
src_configure() {
+ append-cxxflags -std=gnu++14
+
local myconf=(
--with-denoise-level=0
--with-wx-config="${WX_CONFIG}"
diff --git a/net-p2p/amule/amule-.ebuild b/net-p2p/amule/amule-.ebuild
index 392ddb148410..7decbd246b1d 100644
--- a/net-p2p/amule/amule-.ebuild
+++ b/net-p2p/amule/amule-.ebuild
@@ -4,7 +4,7 @@
EAPI=8
WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg-utils
+inherit flag-o-matic wxwidgets xdg-utils
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://github.com/amule-project/amule;
@@ -45,6 +45,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
+ >=sys-devel/boost-m4-0.4_p20221019
nls? ( sys-devel/gettext )
"
@@ -59,13 +60,18 @@ pkg_setup() {
src_prepare() {
default
+ rm m4/boost.m4 || die
if [[ ${PV} == ]]; then
./autogen.sh || die
+ else
+ eautoreconf
fi
}
src_configure() {
+ append-cxxflags -std=gnu++14
+
local myconf=(
--with-denoise-level=0
--with-wx-config="${WX_CONFIG}"
diff --git a/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch
b/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch
new file mode 100644
index ..e52cfd6ae545
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.3-autoconf-2.70.patch
@@ -0,0 +1,28 @@
+From 0d3e85ea46b52685c5b198fbade3a82f38071ca4 Mon Sep 17 00:00:00 2001
+From: Pablo Barciela
+Date: Sun, 19 Sep 2021 13:55:07 +0200
+Subject: [PATCH] allow to build with autoconf 2.70 and later
+
+Closes https://github.com/amule-project/amule/issues/232
+---
+ configure.ac | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 93a918c03..9c57668c6 100644
+--- a/configure.ac
b/configure.ac
+@@ -30,10 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
+ AC_PREREQ(2.62)
+
+-# autoconf 2.70 introduced some incompatibilities that will make the build
fail
+-# As a "workaround" reject 2.70 and above for now.
+-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1],,
[m4_fatal([autoconf ]m4_defn([AC_AUTOCONF_VERSION])[ is known to not work with
aMule. Please use 2.69 instead.])])
+-
+ AC_CONFIG_SRCDIR([src/amule.cpp])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+--
+2.39.3
+
diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
index 32fc55855071..8d9b90c9f6f6 100644
--- a/net-p2p/amule/metadata.xml
+++ b/net-p2p/amule/metadata.xml
@@ -11,6 +11,7 @@
amule-project/amule
+ amule
Enable amule daemon
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/, net-p2p/amule/files/
commit: c7dc14033cc6464195f718cad55c157e1dbf2f81
Author: Alexander Tsoy tsoy me>
AuthorDate: Fri Sep 30 16:16:35 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 1 03:14:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7dc1403
net-p2p/amule: fix build with gcc-11 and musl
Also update EAPI 7 -> 8 and apply pathes to the live version.
Closes: https://bugs.gentoo.org/836739
Closes: https://bugs.gentoo.org/872263
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/27543
Signed-off-by: Sam James gentoo.org>
net-p2p/amule/amule-2.3.3.ebuild| 3 ++-
net-p2p/amule/amule-.ebuild | 6 --
net-p2p/amule/files/amule-2.3.3-fix-exception.patch | 12
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/net-p2p/amule/amule-2.3.3.ebuild b/net-p2p/amule/amule-2.3.3.ebuild
index 1c0c098150de..292872783ad9 100644
--- a/net-p2p/amule/amule-2.3.3.ebuild
+++ b/net-p2p/amule/amule-2.3.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
WX_GTK_VER="3.0-gtk3"
inherit wxwidgets xdg-utils
@@ -50,6 +50,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+ "${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
)
pkg_setup() {
diff --git a/net-p2p/amule/amule-.ebuild b/net-p2p/amule/amule-.ebuild
index a108c9752909..392ddb148410 100644
--- a/net-p2p/amule/amule-.ebuild
+++ b/net-p2p/amule/amule-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
WX_GTK_VER="3.0-gtk3"
inherit wxwidgets xdg-utils
@@ -49,6 +49,8 @@ BDEPEND="
"
PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+ "${FILESDIR}/${PN}-2.3.3-fix-exception.patch"
)
pkg_setup() {
diff --git a/net-p2p/amule/files/amule-2.3.3-fix-exception.patch
b/net-p2p/amule/files/amule-2.3.3-fix-exception.patch
new file mode 100644
index ..ef38f94cfccf
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.3-fix-exception.patch
@@ -0,0 +1,12 @@
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
+index 4b023815c..19c172e61 100644
+--- a/src/libs/common/MuleDebug.cpp
b/src/libs/common/MuleDebug.cpp
+@@ -55,6 +55,7 @@
+ #endif
+
+ #include
++#include
+
+
+ /**
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/, net-p2p/amule/files/
commit: 8eb110137a6b823d357e5dc888a5dc3cfa367b9f
Author: Alexander Tsoy tsoy me>
AuthorDate: Wed Apr 29 17:00:03 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Apr 30 11:59:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb11013
net-p2p/amule: Sync 2.3.2 with live ebuild
* Added missing dependencies on sys-devel/gettext, virtual/libintl,
sys-libs/readline.
* Added MimeType handler to a .desktop file (this also justifies added
dependency on dev-util/desktop-file-utils and xdg-utils eclass usage).
Signed-off-by: Alexander Tsoy tsoy.me>
Signed-off-by: Joonas Niilola gentoo.org>
net-p2p/amule/amule-2.3.2-r5.ebuild| 154 +
.../amule/files/amule-2.3.2-desktop-mimetype.patch | 30
2 files changed, 184 insertions(+)
diff --git a/net-p2p/amule/amule-2.3.2-r5.ebuild
b/net-p2p/amule/amule-2.3.2-r5.ebuild
new file mode 100644
index 000..50397fafc6d
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.2-r5.ebuild
@@ -0,0 +1,154 @@
+# 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"
+)
+
+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 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
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/, net-p2p/amule/files/
commit: 4bff3c8a678a63e0d5aba5a090ec700ced8f40d4
Author: Alexander Tsoy tsoy me>
AuthorDate: Mon Jun 18 18:18:19 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Jun 22 22:17:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bff3c8a
net-p2p/amule: various fixes
Add/remove patches:
- Removed fallocate patch. Not needed according to debian maintainers.
- Fix crash if a shared dir contains UTF-8 chars.
- Fix crash on closing last search tab.
- Compatibility with crypto++ 6.0.0.
- Disable check for updates by default.
Closes: https://bugs.gentoo.org/654692
net-p2p/amule/amule-2.3.2-r2.ebuild| 8 +-
net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch | 25
.../files/amule-2.3.2-disable-version-check.patch | 12 ++
...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 ++
6 files changed, 378 insertions(+), 1 deletion(-)
diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild
b/net-p2p/amule/amule-2.3.2-r2.ebuild
index e219e45a08b..30ed14b5a33 100644
--- a/net-p2p/amule/amule-2.3.2-r2.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r2.ebuild
@@ -33,7 +33,13 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" )
+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
diff --git a/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch
b/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch
new file mode 100644
index 000..d2353447560
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch
@@ -0,0 +1,25 @@
+From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001
+From: Tommy Jerry Mairo
+Date: Wed, 21 Mar 2018 19:56:28 +0100
+Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0
+
+---
+ src/ClientCreditsList.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp
+index 3bea9fe2d..69e881fd8 100644
+--- a/src/ClientCreditsList.cpp
b/src/ClientCreditsList.cpp
+@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting()
+ // calculate and store public key
+ CryptoPP::RSASSA_PKCS1v15_SHA_Verifier
pubkey(*static_cast(m_pSignkey));
+ CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
+- pubkey.DEREncode(asink);
++ pubkey.GetMaterial().Save(asink);
+ m_nMyPublicKeyLen = asink.TotalPutLength();
+ asink.MessageEnd();
+ } catch (const CryptoPP::Exception& e) {
+--
+2.16.4
+
diff --git a/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch
b/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch
new file mode 100644
index 000..74a0203a993
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch
@@ -0,0 +1,12 @@
+Disable NewVersionCheck by default
+--- a/src/Preferences.cpp
b/src/Preferences.cpp
+@@ -1210,7 +1210,7 @@ void CPreferences::BuildItemList( const
+ /**
+* Version check
+**/
+- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool(
wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
++ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool(
wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false )));
+
+/**
+ * Obfuscation
diff --git
a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch
b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch
new file mode 100644
index 000..c480165eb98
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch
@@ -0,0 +1,97 @@
+From 0f0c5c220228aea81142c7c00f73414cdb1b507a Mon Sep 17 00:00:00 2001
+From: gaffa
+Date: Wed, 12 Oct 2016 19:36:21 +0200
+Subject: [PATCH] A workaround for inconsistent behaviour in wxWidgets, where
+ the button release signal is falling through. Instead of calling DeletePage
+ directly an event is added to delete the page after the button release event
+ has been processed by all handlers.
+
+---
+ src/MuleNotebook.cpp | 17 -
+ src/MuleNotebook.h | 13 +
+ 2 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/src/MuleNotebook.cpp b/src/MuleNotebook.cpp
+index ff3ba294e..4ab23ce18 100644
+--- a/src/MuleNotebook.cpp
b/src/MuleNotebook.cpp
+@@ -32,6 +32,7 @@
+
+ DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING)
+
[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/, net-p2p/amule/files/
commit: 38d98ebcfa5aa1e87190eb3ed76fce7150b6ff51
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Nov 7 12:56:42 2015 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Nov 7 12:57:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d98ebc
net-p2p/amule: Support wxGTK:3.0 (#465084)
Package-Manager: portage-2.2.23
net-p2p/amule/amule-2.3.1-r1.ebuild | 112
net-p2p/amule/files/amule-2.3.1-build.patch | 10 +++
net-p2p/amule/files/amule-2.3.1-wx3.0.patch | 45 +++
3 files changed, 167 insertions(+)
diff --git a/net-p2p/amule/amule-2.3.1-r1.ebuild
b/net-p2p/amule/amule-2.3.1-r1.ebuild
new file mode 100644
index 000..8335b24
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+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"
+
+RDEPEND="
+ >=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:${WX_GTK_VER}[X] )
+ !X? ( x11-libs/wxGTK:${WX_GTK_VER} )
+ !net-p2p/imule
+"
+DEPEND="${RDEPEND}"
+
+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
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=465084
+ epatch "${FILESDIR}"/${PN}-2.3.1-wx3.0.patch
+ epatch "${FILESDIR}"/${PN}-2.3.1-build.patch
+}
+
+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-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}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ 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-build.patch
b/net-p2p/amule/files/amule-2.3.1-build.patch
new file mode 100644
index 000..2e977f3
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.1-build.patch
@@ -0,0 +1,10 @@
+--- aMule-2.3.1/src/LoggerConsole.cpp~ 2011-06-13 10:50:25.0 +0200
aMule-2.3.1/src/LoggerConsole.cpp 2015-04-11 10:58:20.592470541 +0200
+@@ -29,6 +29,7 @@
+
+ #include "Logger.h" // for Add(Debug)LogLineM()
+
++DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE)
+
+ #ifdef __DEBUG__
+ bool CLogger::IsEnabled(DebugType /*type*/) const
diff --git a/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
new file mode 100644
index 000..77568b1
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
@@ -0,0 +1,45 @@
+diff -ur
