From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- x11-plugins/Manifest.gz | Bin 28074 -> 28077 bytes x11-plugins/asmon/Manifest | 5 +- x11-plugins/asmon/asmon-0.71-r1.ebuild | 18 +++-- .../asmon/files/asmon-0.71-fno-common.patch | 22 ++++++ x11-plugins/asmon/files/asmon-0.71-list.patch | 10 +-- x11-plugins/enigmail/Manifest | 8 +- x11-plugins/enigmail/enigmail-2.1.7.ebuild | 84 --------------------- x11-plugins/enigmail/enigmail-2.1.8.ebuild | 2 +- x11-plugins/enigmail/enigmail-2.2.4.ebuild | 78 +++++++++++++++++++ x11-plugins/enigmail/enigmail-9999.ebuild | 30 +++----- x11-plugins/pidgin-extprefs/Manifest | 2 +- .../pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild | 17 +++-- x11-plugins/purple-libnotify-plus/Manifest | 3 +- .../purple-libnotify-plus-2.99.1-fno-common.patch | 11 +++ .../purple-libnotify-plus-2.99.1.ebuild | 13 ++-- x11-plugins/wmdrawer/Manifest | 2 +- x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild | 10 ++- x11-plugins/wmmenu/Manifest | 2 +- x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild | 10 ++- 19 files changed, 186 insertions(+), 141 deletions(-) create mode 100644 x11-plugins/asmon/files/asmon-0.71-fno-common.patch delete mode 100644 x11-plugins/enigmail/enigmail-2.1.7.ebuild create mode 100644 x11-plugins/enigmail/enigmail-2.2.4.ebuild create mode 100644 x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch (limited to 'x11-plugins') diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz index 2b17eb6f27a8..ccdbdad619c6 100644 Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest index 7926600dcf1f..c95785eab983 100644 --- a/x11-plugins/asmon/Manifest +++ b/x11-plugins/asmon/Manifest @@ -1,4 +1,5 @@ -AUX asmon-0.71-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144 +AUX asmon-0.71-fno-common.patch 451 BLAKE2B 81b60caf28ded54bb0311f3ca83e9f01acc3122c65338d7d8d4364413dc9be5bef0226037f8f0b74856a004552ddf70f74bd01dd34926d35cff481db27e54e09 SHA512 7f1851289a3400b147bcef27732091a0b1a365596bd524f9e8f229f447895a1d73ab51f6eaac9550a2cd49229edfce4152370ac668f4c1629f597282083afac9 +AUX asmon-0.71-list.patch 2632 BLAKE2B b7221d48285441cbab3fb13f4b406deb02dfadc3d3dd8dabdfab886cf26d89b397133fc7ff9b0c7baaa9fe4ede8deb3cb2752ba79f7de0d4bb23dcfd76b02010 SHA512 7ceabc659ff3059dc782f72039a25a78e988a5c9b31b67662f2da92084d46411d08507fecfcbca806e9eb96680b7c0654b9c41fca4f3236d8db4d367917da297 DIST asmon-0.71.tar.bz2 42235 BLAKE2B 5e82638ae115ea088e4936615e8a67074cb8a1bde42607f37837edb1d774f24bb71d3db1d69780e4810eafcdaef681306fc07ce50e8eed1a96edf610cc081cbc SHA512 20d321b228e0157e9e2611eeac017fdf6a9e9eb8ba6e02c7c30adadb411529da408b7a543e18b30de0659ccf4f86bfde21bef392e2a4756803c58a9f28c31c45 -EBUILD asmon-0.71-r1.ebuild 744 BLAKE2B 739091e78a857114e4f5ce97b2c3bcf37828cb8ba6d7ff82b9aad951f50522250378f191cb891838c2fe0ff59bb31f1a7cc413b1581dd82ee172e22d3ce1ff49 SHA512 71d918d326d5da7d7eac357fe71c1ef15d6a97753006ab33094d3d3b99d995298d801e77d16cc437ede79dbef43d697536f0b7679a5e36db1e4026a60be7742e +EBUILD asmon-0.71-r1.ebuild 782 BLAKE2B a9975298aabc0d07df1d89465795837e530eea8aa3ba4b8c1fdd6bed8e1ae3e98f64b07ce996f6e44c2f4343ba3011ec45668db82a19922bcef38ca4b3977bc6 SHA512 0640ce1569ffeb8b39059bd4d063265373176b6da2f5460e02a0100e37c2677ceb84e40d25f6ffb96fb76d6de61d5e1a216491a1c40f2a535e023190aaab9782 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild index 2c91504fc699..2d2ce19ee4ef 100644 --- a/x11-plugins/asmon/asmon-0.71-r1.ebuild +++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="WindowMaker/AfterStep system monitor dockapp" HOMEPAGE="http://rio.vg/asmon" SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2" +S="${WORKDIR}/${P}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86" -IUSE="" RDEPEND="x11-libs/libXext x11-libs/libXpm @@ -19,13 +20,14 @@ RDEPEND="x11-libs/libXext DEPEND="${RDEPEND} x11-base/xorg-proto" -S=${WORKDIR}/${P}/${PN} - src_prepare() { + default + sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die - cd "${WORKDIR}"/${P} || die - epatch "${FILESDIR}"/${P}-list.patch + cd "../wmgeneral" || die + eapply "${FILESDIR}/${P}-list.patch" + eapply "${FILESDIR}/${P}-fno-common.patch" } src_compile() { diff --git a/x11-plugins/asmon/files/asmon-0.71-fno-common.patch b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch new file mode 100644 index 000000000000..831d6b258163 --- /dev/null +++ b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/708118 +--- a/wmgeneral.c ++++ b/wmgeneral.c +@@ -50,6 +50,7 @@ Window iconwin, win; + GC NormalGC; + XpmIcon wmgen; + Pixmap pixmask; ++Display *display; + + /*****************/ + /* Mouse Regions */ +--- a/wmgeneral.h ++++ b/wmgeneral.h +@@ -28,7 +28,7 @@ typedef struct { + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch index 1b1ac317669e..89e9ef321673 100644 --- a/x11-plugins/asmon/files/asmon-0.71-list.patch +++ b/x11-plugins/asmon/files/asmon-0.71-list.patch @@ -1,6 +1,5 @@ -diff -Naur wmgeneral.orig/list.c wmgeneral/list.c ---- wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100 -+++ wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 +--- a/list.c ++++ b/list.c @@ -38,7 +38,7 @@ /* Return a cons cell produced from (head . tail) @@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c list_mapcar(LinkedList* list, void(*function)(void*)) { while(list) -diff -Naur wmgeneral.orig/list.h wmgeneral/list.h ---- wmgeneral.orig/list.h 2016-01-04 13:28:36.583339716 +0100 -+++ wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 +--- a/list.h ++++ b/list.h @@ -29,31 +29,25 @@ #ifndef __LIST_H_ #define __LIST_H_ diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest index 9834e62855bc..41a70dac40aa 100644 --- a/x11-plugins/enigmail/Manifest +++ b/x11-plugins/enigmail/Manifest @@ -1,10 +1,10 @@ AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74 -DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41 DIST enigmail-2.1.8.tar.gz 2867390 BLAKE2B 8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a SHA512 b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb +DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937 -EBUILD enigmail-2.1.7.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0 -EBUILD enigmail-2.1.8.ebuild 2254 BLAKE2B 901ad5c969a2b82c8be8d683323258981ca28f260642761e7ff94df6c76e8b4b81afab67c321f106be414ffdc17b5fdc08336fca53cbacb2c198a5611e1e0967 SHA512 238a2aee1fd06d61d99c495a625cc191b404ff0efe631b79b031882ff774752221e4ca58c445d958b9d167dbb0199ab9647caf7b8cd7642b9bafaa869802bce3 -EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6 +EBUILD enigmail-2.1.8.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0 +EBUILD enigmail-2.2.4.ebuild 2019 BLAKE2B 78a2e43af9cfbfe128313aa6cfa0575aeb15248a850c62cbe902e3fc05b4396f5c187f675640ad610e00330ddbeaa652a2ddf7276caf14ca8e35e82bb7b59094 SHA512 e13cf5623532dc6f58b1c33be8d1d373edb829bfd2bd55fa7f0d773edc0909ba7848dc473ed6e8a8d9b45dbdb90f965c6b521122ce409c406870ed3623973e72 +EBUILD enigmail-9999.ebuild 2023 BLAKE2B 4d060acb5ba2aa75037f191f775ef673e50946b3435c4a63c1b21e3e9db67499908f1cfc0a290afca47417301716832991a4301c03d7664eea4e0303ef0b2e58 SHA512 7a6e2fa7e3ac1fbb1de05c8045efc9f7987c17bb06f1935e72aae79bef78bced0cea04534ccc8165d065b35330a17c9f2e1ec75f650380e84378f12525098aa2 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b diff --git a/x11-plugins/enigmail/enigmail-2.1.7.ebuild b/x11-plugins/enigmail/enigmail-2.1.7.ebuild deleted file mode 100644 index 53f90a93be8c..000000000000 --- a/x11-plugins/enigmail/enigmail-2.1.7.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit python-any-r1 - -DESCRIPTION="Mozilla extension to provide GPG support in mail clients" -HOMEPAGE="https://www.enigmail.net/" - -SLOT="0" -LICENSE="MPL-2.0 GPL-3" -IUSE="" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source" - S="${WORKDIR}/${P}" -else - if [[ ${PV} = *_beta* ]] ; then - SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz" - else - SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" - fi - S="${WORKDIR}/${PN}" -fi - -RDEPEND=" - ( >=app-crypt/gnupg-2.0 - || ( - app-crypt/pinentry[gtk(-)] - app-crypt/pinentry[qt5(-)] - ) - ) - !=x11-libs/gdk-pixbuf-2.42.0:2 + ) + =x11-libs/gdk-pixbuf-2.42.0:2 + ) + =x11-libs/libdockapp-0.7:=" DEPEND="${RDEPEND}" -- cgit v1.2.3