commit: 1be23469200504c17d09cee7b528617f66b2d901 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Mon Apr 28 13:21:16 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 17 15:52:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be23469
net-p2p/amule: USE=X -> USE=gui Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Part-of: https://github.com/gentoo/gentoo/pull/41825 Closes: https://github.com/gentoo/gentoo/pull/41825 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{amule-2.3.3-r6.ebuild => amule-2.3.3-r7.ebuild} | 15 +++++++-------- net-p2p/amule/amule-9999.ebuild | 13 +++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/net-p2p/amule/amule-2.3.3-r6.ebuild b/net-p2p/amule/amule-2.3.3-r7.ebuild similarity index 92% rename from net-p2p/amule/amule-2.3.3-r6.ebuild rename to net-p2p/amule/amule-2.3.3-r7.ebuild index 4485acf1e000..ddd8dfc24df5 100644 --- a/net-p2p/amule/amule-2.3.3-r6.ebuild +++ b/net-p2p/amule/amule-2.3.3-r7.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.amule.org/"; LICENSE="GPL-2+" SLOT="0" -IUSE="daemon debug geoip nls remote stats upnp +X" +IUSE="daemon debug geoip +gui nls remote stats upnp" RDEPEND=" dev-libs/boost:= @@ -29,9 +29,10 @@ RDEPEND=" sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}=[X?] + x11-libs/wxGTK:${WX_GTK_VER}= daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) + gui? ( x11-libs/wxGTK:${WX_GTK_VER}=[X] ) nls? ( virtual/libintl ) remote? ( acct-user/amule @@ -41,7 +42,7 @@ RDEPEND=" upnp? ( net-libs/libupnp:0 ) " DEPEND="${RDEPEND} - X? ( dev-util/desktop-file-utils ) + gui? ( dev-util/desktop-file-utils ) " BDEPEND=" virtual/pkgconfig @@ -91,7 +92,7 @@ src_configure() { $(use_enable upnp) ) - if use X; then + if use gui; then myconf+=( $(use_enable remote amule-gui) $(use_enable stats alc) @@ -133,8 +134,6 @@ src_install() { } pkg_postinst() { - local ver - 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" @@ -146,9 +145,9 @@ pkg_postinst() { elog "/etc/conf.d/{amuled,amuleweb} to the old values." fi - use X && xdg_desktop_database_update + use gui && xdg_desktop_database_update } pkg_postrm() { - use X && xdg_desktop_database_update + use gui && xdg_desktop_database_update } diff --git a/net-p2p/amule/amule-9999.ebuild b/net-p2p/amule/amule-9999.ebuild index 0cc5ff828677..9da35c53b9e1 100644 --- a/net-p2p/amule/amule-9999.ebuild +++ b/net-p2p/amule/amule-9999.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://www.amule.org/"; LICENSE="GPL-2+" SLOT="0" -IUSE="daemon debug geoip nls remote stats upnp +X" +IUSE="daemon debug geoip +gui nls remote stats upnp" RDEPEND=" dev-libs/boost:= @@ -29,9 +29,10 @@ RDEPEND=" sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}=[X?] + x11-libs/wxGTK:${WX_GTK_VER}= daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) + gui? ( x11-libs/wxGTK:${WX_GTK_VER}=[X] ) nls? ( virtual/libintl ) remote? ( acct-user/amule @@ -41,7 +42,7 @@ RDEPEND=" upnp? ( net-libs/libupnp:0 ) " DEPEND="${RDEPEND} - X? ( dev-util/desktop-file-utils ) + gui? ( dev-util/desktop-file-utils ) " BDEPEND=" virtual/pkgconfig @@ -88,7 +89,7 @@ src_configure() { $(use_enable upnp) ) - if use X; then + if use gui; then myconf+=( $(use_enable remote amule-gui) $(use_enable stats alc) @@ -141,9 +142,9 @@ pkg_postinst() { elog "/etc/conf.d/{amuled,amuleweb} to the old values." fi - use X && xdg_desktop_database_update + use gui && xdg_desktop_database_update } pkg_postrm() { - use X && xdg_desktop_database_update + use gui && xdg_desktop_database_update }
