commit: 176edf38780eeb9d2cf739dce2ff35cc19b8353a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Feb 1 09:47:16 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Feb 1 09:50:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176edf38
net-vpn/networkmanager-wireguard: Remove last-rited pkg Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-vpn/networkmanager-wireguard/Manifest | 1 - ...reguard-0_pre20191128-change-appdata-path.patch | 29 ---------- net-vpn/networkmanager-wireguard/metadata.xml | 12 ----- ...etworkmanager-wireguard-0_pre20191128-r5.ebuild | 63 ---------------------- .../networkmanager-wireguard-9999.ebuild | 58 -------------------- profiles/package.mask | 6 --- profiles/updates/3Q-2019 | 1 - 7 files changed, 170 deletions(-) diff --git a/net-vpn/networkmanager-wireguard/Manifest b/net-vpn/networkmanager-wireguard/Manifest deleted file mode 100644 index 406c834096b..00000000000 --- a/net-vpn/networkmanager-wireguard/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST networkmanager-wireguard-0_pre20191128.tar.gz 238536 BLAKE2B e926c08c68df3e452a7ba25c66e7678969594002cb45a03ca26af32c86b021260c7836157fe9244c07223bf2e1c821ee64c3535c392f3636217c6ae67d8b800a SHA512 4ed9566a18be01b1be7d92da4663a292e17804a706045d58f08640e2fe81f9672880f20d1657b70eafc769b2688f72928c6fa601c0011bde91347902a222e670 diff --git a/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch b/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch deleted file mode 100644 index d774613a917..00000000000 --- a/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f02a7863a13ad5da340b35648ae5cefc0789869e Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <con...@kostecki.com> -Date: Mon, 20 Apr 2020 17:00:58 +0200 -Subject: [PATCH] Makefile.am: store appdata to /usr/share/metainfo - -The path '/usr/share/appdata' is deprecated and -should be changed to '/usr/share/metainfo'. - -See section: 2.1.2. Filesystem locations -https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html - -Signed-off-by: Conrad Kostecki <con...@kostecki.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 81c6923..53d6f1b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -266,7 +266,7 @@ uninstall-hook: - rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-wireguard-service.name - endif - --appdatadir = $(datadir)/appdata -+appdatadir = $(datadir)/metainfo - appdata_files = $(appdata_in_files:.xml.in=.xml) - if WITH_GNOME - appdata_DATA = $(appdata_files) diff --git a/net-vpn/networkmanager-wireguard/metadata.xml b/net-vpn/networkmanager-wireguard/metadata.xml deleted file mode 100644 index 7c35c1d67d1..00000000000 --- a/net-vpn/networkmanager-wireguard/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>conik...@gentoo.org</email> - <name>Conrad Kostecki</name> - </maintainer> - <longdescription> - This project is a VPN Plugin for NetworkManager that handles client-side WireGuard connections. - It is based on the OpenVPN Plugin and was started as a Bachelor's Thesis at SBA Research. - </longdescription> -</pkgmetadata> diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild deleted file mode 100644 index 4d9e66dee6b..00000000000 --- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -EGIT_COMMIT="0e1124df9e97129c5e0d9996a2c3876ae18f01c4" -MY_PN="${PN/network/network-}" - -DESCRIPTION="NetworkManager WireGuard plugin" -HOMEPAGE="https://github.com/max-moser/network-manager-wireguard" -SRC_URI="https://github.com/max-moser/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+gtk +nls" - -RDEPEND=" - >=net-misc/networkmanager-1.7.0 - net-vpn/wireguard-tools[wg-quick] - >=dev-libs/glib-2.32:2 - gtk? ( - >=x11-libs/gtk+-3.4:3 - >=net-libs/libnma-1.7.0 - >=app-crypt/libsecret-0.18 - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}" - -PATCHES="${FILESDIR}/${PN}-0_pre20191128-change-appdata-path.patch" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-lto - --disable-more-warnings - --disable-static - $(use_with gtk gnome) - --without-libnm-glib - $(use_enable nls) - --with-dist-version="Gentoo" - ) - - econf "${myeconfargs[@]}" -} diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild deleted file mode 100644 index 7f5d26e4d12..00000000000 --- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -DESCRIPTION="NetworkManager WireGuard plugin" -HOMEPAGE="https://github.com/max-moser/network-manager-wireguard" -SRC_URI="" -EGIT_REPO_URI="https://github.com/max-moser/network-manager-wireguard" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+gtk +nls" - -RDEPEND=" - >=net-misc/networkmanager-1.7.0 - net-vpn/wireguard-tools[wg-quick] - >=dev-libs/glib-2.32:2 - gtk? ( - >=x11-libs/gtk+-3.4:3 - >=net-libs/libnma-1.7.0 - >=app-crypt/libsecret-0.18 - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -PATCHES="${FILESDIR}/${PN}-0_pre20191128-change-appdata-path.patch" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-lto - --disable-more-warnings - --disable-static - $(use_with gtk gnome) - --without-libnm-glib - $(use_enable nls) - --with-dist-version="Gentoo" - ) - - econf "${myeconfargs[@]}" -} diff --git a/profiles/package.mask b/profiles/package.mask index 67ceeae2082..a6010b2421e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -212,12 +212,6 @@ sci-physics/paw # Removal in 30 days, bug #677322, bug #707200, bug #716012 net-dialup/diald -# Conrad Kostecki <conik...@gentoo.org> (2021-01-01) -# NetworkManager has buildin support for WireGuard, -# this plugin is old and unmaintained, so let's drop it. -# Removal in 30 days. -net-vpn/networkmanager-wireguard - # Sam James <s...@gentoo.org> (2021-01-01) # UnrealIRCd 4.x is EOL. Please upgrade to 5.x. # To be removed shortly. diff --git a/profiles/updates/3Q-2019 b/profiles/updates/3Q-2019 index c7b90886273..dde92e17690 100644 --- a/profiles/updates/3Q-2019 +++ b/profiles/updates/3Q-2019 @@ -4,4 +4,3 @@ move kde-apps/kjots app-text/kjots move app-arch/upx-ucl app-arch/upx slotmove app-text/docbook-xml-simple-dtd 0 4.1.2.4 move sys-apps/lm_sensors sys-apps/lm-sensors -move net-misc/networkmanager-wireguard net-vpn/networkmanager-wireguard