From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C609F138335 for ; Mon, 22 Apr 2019 07:26:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92D2BE087A; Mon, 22 Apr 2019 07:26:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 603FCE0863 for ; Mon, 22 Apr 2019 07:26:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEA04341FA3 for ; Mon, 22 Apr 2019 07:26:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 465745A9 for ; Mon, 22 Apr 2019 07:26:41 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1555917992.e8dc99ed1e5f679d13ff5ecd1926bbb23d6a7dea.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/amule/amule-2.3.2-r1.ebuild net-p2p/amule/files/amule-2.2.6-fallocate.diff X-VCS-Directories: net-p2p/amule/files/ net-p2p/amule/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e8dc99ed1e5f679d13ff5ecd1926bbb23d6a7dea X-VCS-Branch: master Date: Mon, 22 Apr 2019 07:26:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d549fd12-3a4f-4c66-8f47-99c705c2162f X-Archives-Hash: 7caac4b3e29ed70dfe19de25d4b051db commit: e8dc99ed1e5f679d13ff5ecd1926bbb23d6a7dea Author: Alexander Tsoy tsoy me> AuthorDate: Mon Apr 15 20:58:34 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Apr 22 07:26:32 2019 +0000 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..00000000000 --- 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..00000000000 --- 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),