diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest index b0ca0f9..3adc709 100644 --- a/net-misc/wicd/Manifest +++ b/net-misc/wicd/Manifest @@ -4,9 +4,4 @@ AUX wicd-1.7.3-bitrate-property.patch 775 BLAKE2B d1897f86293f11ea3cab807500eb08 AUX wicd-1.7.3-undefined-LANG.patch 946 BLAKE2B 8f9cbebc5acb32d36c7335083f13e76ba46424bc0069d057770c94f7fbd64039c8d00d8323bd737ec39079554bb607723ca7ed3886da8bc1fdeaa59f63f545c1 SHA512 c2d197d41a84975bb3caf44de9b05b741b6702c38079ecc917632f9eedcf2be71373416154013690620511f2e9e99fb0d88cee0b22292fe007795cde664e63e5 AUX wicd-1.7.3-urwid-1.3.0.patch 477 BLAKE2B b573ad0b47e1cf5ec0b78d0beff0c2791f5d918a59190afe48fc3f7cd1920c45e27818dcf88ece610d5187ee5ba5f2a014e290c625c0c586b5a78490879ed9fc SHA512 f5904e9fd082fb77d6b930285d6f1662d603d11c348068ec29820683aee319adf4ff0ddd28f7da80dc3c5b5834d9f9a0649d4077aed09d6c8ce8e24d8791d5c6 AUX wicd-init-sve-start.patch 317 BLAKE2B 12fbe09fc6649b24b9f5c11dd867a8f1c5f88c39ea82381a4d5b063324493895963435ec1d874d7ce25783cdc4bf1f4eff3637a45ad407e073063ebe4e047782 SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc -DIST Icone-Wicd-Lucid.tar.gz 9015 BLAKE2B 20c55968fe2be08a6dc5e2b3584f9c4294c69a988789bcaad80bed02daf0cc971344578eac7a69208fabb0c5faefb47891dec0977d04d7bcfcb24c9ba7394385 SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 -DIST wicd-1.7.4.tar.gz 547393 BLAKE2B 045073781eb81a29754a238c0fded5d3225727497ea24c6cea58a1c72b83da76af6fc40a8e7345652c2dc9eb68ed24e0d97e421fd8c9e4d909a2c8f9460881ea SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959 -DIST wicd-mac4lin-icons.tar.xz 53136 BLAKE2B 5064546c2aebda92ce168847f2821ff11653939c21667f7f48263d3be0a9100dffa1322b9b2842cb92a2ca50dec39114b1246b057663ede8708db17271f16af3 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8 -EBUILD wicd-1.7.4-r3.ebuild 5063 BLAKE2B 64b0a6b00f68c554b240bfff6572e766d9ea88928896c68dccbcaac37d1bd56328ea032e6a6f4f554400bb301ed8362c735772540751edbbfedd2d2b4a51c2ca SHA512 defa56dc408a9175a0ca806c66056ed97d3972910284887a177e0dc312ec70b434b8b7ecbaf10cdac29b825796b2ca064892925b0f24f0dbd6a1e0e3485c9b7e -EBUILD wicd-9999.ebuild 2898 BLAKE2B 08a3935e58a417319e15d36805c64a96bc04f8aa64cd0172fdb363dbb3f8d31664c49e82d1c317c67359aff95c182163cbb6cac0c2accf361dcadff73407f594 SHA512 c1fcf27b2ef13cb1dbdce27969a433f7052302f02036d94821d5c3f2f6bb09960eb530c64d610c215b37dd3c88d3f1db3318f551db350acd1f8a0d6d27fef387 -MISC metadata.xml 913 BLAKE2B 8e18aa7554e1bafb89f90f6fa27bfbfedf76d3cc63929311d2ad4c87cd13869dcc2cc90c126c9ef61ebba5ff765e59656a5516cb410fb365beaa97dc47d54e11 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69 +EBUILD wicd-9999.ebuild 3788 BLAKE2B 4fb919309de40f2c21fc9918fb6ba150ab43c9f28b580aaf8203eb116f3534f3fcd47593c2f3aa546e386f8d65fc6fa481aaeb321f37eab1bccd8025573ca1e1 SHA512 3c922d9286a7b5b454b60f6ec3647bdb9e4b90dd7caa0f9500256f8f4b987f92b3c85f25a0222e50cb3a511650557da8f580dcb0b5da3943713d0ae2a9e46266 diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml deleted file mode 100644 index 8fa9771..0000000 --- a/net-misc/wicd/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Install icons from Ubuntu's ambiance theme - Installs a gtk UI. This is enabled by default because it is - intended behavior. Requires dev-python/pygtk - Installs additional python libraries to use as a backend. - This will improve speed but is experimental. - Change default icons to mac4lin icon set - Installs a ncurses UI - Installs the pm-utils hooks for suspend/resume and - requires sys-power/pm-utils - Install gnome-shell extension - - - wicd - - diff --git a/net-misc/wicd/wicd-1.7.4-r3.ebuild b/net-misc/wicd/wicd-1.7.4-r3.ebuild deleted file mode 100644 index e23c2b7..0000000 --- a/net-misc/wicd/wicd-1.7.4-r3.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ncurses?,xml" - -inherit eutils distutils-r1 linux-info readme.gentoo-r1 systemd - -DESCRIPTION="A lightweight wired and wireless network manager for Linux" -HOMEPAGE="https://launchpad.net/wicd" -SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz - mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz ) - ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell" - -DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )" -RDEPEND="${PYTHON_DEPS} - dev-python/dbus-python[${PYTHON_USEDEP}] - X? ( - gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] ) - || ( - x11-misc/ktsuss - kde-plasma/kde-cli-tools[kdesu] - ) - ) - || ( - net-misc/dhcpcd - net-misc/dhcp - net-misc/pump - ) - net-wireless/wireless-tools - net-wireless/wpa_supplicant - || ( - sys-apps/net-tools - sys-apps/ethtool - ) - !gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] ) - ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}] - dev-python/python-wpactrl[${PYTHON_USEDEP}] ) - libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) - ncurses? ( - dev-python/urwid[${PYTHON_USEDEP}] - dev-python/pygobject:2[${PYTHON_USEDEP}] - ) - pm-utils? ( sys-power/pm-utils ) - gnome-shell? ( gnome-base/gnome-shell ) - || ( - >=sys-apps/util-linux-2.31_rc1 - net-wireless/rfkill - ) - " -PATCHES=( - "${FILESDIR}"/${PN}-init-sve-start.patch - # The Categories entry in the .desktop files is outdated - "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch - # Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413 - # Creates files -> give -p - "${FILESDIR}"/${PN}-1.7.3-add-missing-gnome-shell-extension.patch - # If LANG is undefined, build can fail (bug 537202) - "${FILESDIR}"/${PN}-1.7.3-undefined-LANG.patch - # Fix urwid compat again - "${FILESDIR}"/${PN}-1.7.3-urwid-1.3.0.patch - # Another compatibility patch from launchpad bug 1075399 - "${FILESDIR}"/${PN}-1.7.3-bitrate-property.patch -) - -src_prepare() { - CONFIG_CHECK="~CFG80211_WEXT" - local WARNING_CFG80211_WEXT="Wireless extensions have not been \ - configured in your kernel. Wicd will not work unless CFG80211_WEXT is set." - check_extra_config - - default - - # get rid of opts variable to fix bug 381885 - sed -i "/opts/d" "in/init=gentoo=wicd.in" || die - # Need to ensure that generated scripts use Python 2 at run time. - sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \ - -i setup.py || die "sed failed" - # Fix misc helper scripts: - sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \ - -i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py || die - # fix shebang for openrc init script (bug #573846) - sed 's@/sbin/runscript@/sbin/openrc-run@' \ - -i in/init=gentoo=wicd.in || die - if use nls; then - # Asturian is faulty with PyBabel - # (https://bugs.launchpad.net/wicd/+bug/928589) - rm po/ast.po - # zh_CN fails with newer PyBabel (Aug 2013) - rm po/zh_CN.po - else - # nuke translations - rm po/*.po - fi - - DOC_CONTENTS="To start wicd at boot with openRC, add - /etc/init.d/wicd to a runlevel and: (1) Remove all net.* - initscripts (except for net.lo) from all runlevels (2) Add these - scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For - example, rc_hotplug=\"!net.eth* !net.wlan*\")" -} - -src_configure() { - local myconf - use gtk || myconf="${myconf} --no-install-gtk" - use libnotify || myconf="${myconf} --no-use-notifications" - use ncurses || myconf="${myconf} --no-install-ncurses" - use pm-utils || myconf="${myconf} --no-install-pmutils" - use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions" - python_setup - "${EPYTHON}" ./setup.py configure --no-install-docs \ - --resume=/usr/share/wicd/scripts/ \ - --suspend=/usr/share/wicd/scripts/ \ - --verbose ${myconf} -} - -src_install() { - distutils-r1_src_install - keepdir /var/lib/wicd/configurations - keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} - keepdir /var/log/wicd - use nls || rm -rv "${D}"/usr/share/locale - systemd_dounit "${S}/other/wicd.service" - - if use mac4lin; then - rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons" - mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/ || die - fi - if use ambiance; then - # Overwrite tray icons with ambiance icon - rm "${WORKDIR}/Icone Wicd Lucid"/signal* || die - cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/ || die - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - # Maintainer's note: the consolekit use flag short circuits a dbus rule and - # allows the connection. Else, you need to be in the group. - if ! has_version sys-auth/consolekit; then - ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If" - ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf" - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/wicd/wicd-9999.ebuild b/net-misc/wicd/wicd-9999.ebuild index 3ab3e7a..284f5b7 100644 --- a/net-misc/wicd/wicd-9999.ebuild +++ b/net-misc/wicd/wicd-9999.ebuild @@ -1,23 +1,30 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +# NOTE: WICD is still broken, although there was some work done with porting +# it to Python3 and make it work again. See https://git.launchpad.net/wicd for +# latest commits. -PYTHON_COMPAT=( python3_{7,8} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{11,12} ) PYTHON_REQ_USE="ncurses,xml" -inherit eutils distutils-r1 linux-info readme.gentoo-r1 systemd git-r3 +inherit distutils-r1 linux-info readme.gentoo-r1 systemd git-r3 +DISTUTILS_USE_PEP517=setuptools DESCRIPTION="A lightweight wired and wireless network manager for Linux" HOMEPAGE="https://launchpad.net/wicd" -#EGIT_REPO_URI='https://git.launchpad.net/wicd' +EGIT_REPO_URI='https://git.launchpad.net/wicd' #EGIT_COMMIT='63812468bec3ee94c2dd6c8268f9e7b341273be5' #EGIT_REPO_URI='https://github.com/gryf/wicd' -EGIT_REPO_URI='file:///home/gryf/Devel/Python/wicd' +#EGIT_REPO_URI='file:///home/gryf/Devel/Python/wicd' LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" + +KEYWORDS="" IUSE="doc nls +pm-utils" DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )" @@ -38,6 +45,21 @@ RDEPEND="${PYTHON_DEPS} dev-python/pygobject:3[${PYTHON_USEDEP}] pm-utils? ( sys-power/pm-utils ) " +PATCHES=( + # This one is probably not needed: "${FILESDIR}"/${PN}-init-sve-start.patch + # The Categories entry in the .desktop files is outdated. Valid. + "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch + # Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413 + # Creates files -> give -p + # This one is probably outdated now: "${FILESDIR}"/${PN}-1.7.3-add-missing-gnome-shell-extension.patch + # If LANG is undefined, build can fail (bug 537202) + # Outdated, setup.py is totally rewroten: "${FILESDIR}"/${PN}-1.7.3-undefined-LANG.patch + # Fix urwid compat again + # This one might be not needed, as currently urwid is in version 2.1.x: "${FILESDIR}"/${PN}-1.7.3-urwid-1.3.0.patch + # Another compatibility patch from launchpad bug 1075399. This one is + # valid. + "${FILESDIR}"/${PN}-1.7.3-bitrate-property.patch +) src_prepare() { CONFIG_CHECK="~CFG80211_WEXT"