From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 362D41582EF for ; Mon, 17 Feb 2025 09:26:14 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 12D54343281 for ; Mon, 17 Feb 2025 09:26:14 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 16A711103A8; Mon, 17 Feb 2025 09:26:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 0FB3D1103A8 for ; Mon, 17 Feb 2025 09:26:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4F06343281 for ; Mon, 17 Feb 2025 09:26:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 113B02732 for ; Mon, 17 Feb 2025 09:26:11 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1739784323.8921d5b7e35825aa02ecb05642fc793963bf9473.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/amule/amule-2.3.3-r4.ebuild net-p2p/amule/amule-9999.ebuild X-VCS-Directories: net-p2p/amule/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8921d5b7e35825aa02ecb05642fc793963bf9473 X-VCS-Branch: master Date: Mon, 17 Feb 2025 09:26:11 +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: 3cd52bd4-fff8-4001-8fe6-57e9871c0781 X-Archives-Hash: cd079ac7b2e79424f4a3f7a78580f3a4 commit: 8921d5b7e35825aa02ecb05642fc793963bf9473 Author: Ulrich Müller gentoo org> AuthorDate: Fri Feb 14 14:11:49 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Feb 17 09:25:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8921d5b7 net-p2p/amule: Port to ver_replacing Signed-off-by: Ulrich Müller gentoo.org> net-p2p/amule/amule-2.3.3-r4.ebuild | 26 ++++++++++---------------- net-p2p/amule/amule-9999.ebuild | 30 +++++++++++------------------- 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/net-p2p/amule/amule-2.3.3-r4.ebuild b/net-p2p/amule/amule-2.3.3-r4.ebuild index cadfc1d4efb0..5e5e87a0bdaf 100644 --- a/net-p2p/amule/amule-2.3.3-r4.ebuild +++ b/net-p2p/amule/amule-2.3.3-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit autotools flag-o-matic wxwidgets xdg-utils +inherit autotools eapi9-ver flag-o-matic wxwidgets xdg-utils if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/amule-project/amule" @@ -135,21 +135,15 @@ src_install() { 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 the old location and adjust" - elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" - elog "/etc/conf.d/{amuled,amuleweb} to the old values." - - break - fi - done + if use daemon || use remote && ver_replacing -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 the old location and adjust" + elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" + elog "/etc/conf.d/{amuled,amuleweb} to the old values." fi use X && xdg_desktop_database_update diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild index 35d9d3390ddf..4ca517b252db 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit autotools flag-o-matic wxwidgets xdg-utils +inherit autotools eapi9-ver flag-o-matic wxwidgets xdg-utils if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/amule-project/amule" @@ -130,23 +130,15 @@ src_install() { } 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 the old location and adjust" - elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" - elog "/etc/conf.d/{amuled,amuleweb} to the old values." - - break - fi - done + if use daemon || use remote && ver_replacing -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 the old location and adjust" + elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" + elog "/etc/conf.d/{amuled,amuleweb} to the old values." fi use X && xdg_desktop_database_update