From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- x11-misc/Manifest.gz | Bin 48513 -> 48515 bytes x11-misc/i3blocks/Manifest | 2 +- x11-misc/i3blocks/metadata.xml | 10 +- x11-misc/i3lock/Manifest | 2 +- x11-misc/i3lock/metadata.xml | 6 +- x11-misc/py3status/Manifest | 4 +- x11-misc/py3status/py3status-3.38.ebuild | 31 ---- x11-misc/py3status/py3status-3.39.ebuild | 34 ++++ x11-misc/xscreensaver/Manifest | 6 +- x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild | 169 ------------------ x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild | 173 ------------------ x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild | 200 --------------------- x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild | 202 ---------------------- x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 2 +- 14 files changed, 46 insertions(+), 795 deletions(-) delete mode 100644 x11-misc/py3status/py3status-3.38.ebuild create mode 100644 x11-misc/py3status/py3status-3.39.ebuild delete mode 100644 x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild delete mode 100644 x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild delete mode 100644 x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild delete mode 100644 x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index bb292ea68ce0..1fec44ac937b 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest index ee4700661f53..2e9d39c2b8ef 100644 --- a/x11-misc/i3blocks/Manifest +++ b/x11-misc/i3blocks/Manifest @@ -1,4 +1,4 @@ AUX i3blocks-disable-bash-completion.patch 396 BLAKE2B 1ed07e8bc335117e4dcbf048efadea33306575f706bb88006cd5528158ff9ddcf373202fa4f5d007de69d5694c3521137d23ae108b825123f72858fa4f3d724a SHA512 b388bbaf394f791f052cfe3cda97f9c69b36fe30cee3954df27888585285abe22c6d21d8d2f611467583581d153d00f55477a3458b46d9b741662ace16a00d5c DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534 EBUILD i3blocks-1.5-r1.ebuild 633 BLAKE2B 6f8faffed53680ba459deddd5153d5acb43602c57cb6fac17400c9b2373e5b153d48e997944925c68824f9f008c4256930e09d65171b8d897dd7ec05b0d77133 SHA512 0ccd2efd114bb3be218a094170647048c417811727ccddba89e489e3bcdc82db3249a2461080133b09309d37c11a570c5e647a1e3ae8cd86e1cec0caf4987b19 -MISC metadata.xml 547 BLAKE2B 468d8463913aa9725c081b2c046b41e993c6003e2c2fd062b4f7ae9f13d848dbdc17460d05760810827b91f16ea756d25a545a61ba23c1a8ff52985d3dae7141 SHA512 a57511c3d807d6b05eadd4c31130680ccd60663ff8924e31aa7539922ed7a7a8dc3f687e80b6a2cdb2b648351e4b399f079b407ced2af5f5970ddcf1157cff66 +MISC metadata.xml 396 BLAKE2B 5f3f6bbca0493fec5cd22dcd4c1534fded5ff72b15265b49dac6c765ab566a61ad2db2bae9e97f1e829dad90a76a6957a9a62106a0a2180d029333dd4d24b6bc SHA512 db782ef27d14c32a6eab13bf2cf7909a96d7a4bb1a36fde27ada7f1d6910a29ff4a5ee7629888ddb73f199e8c8659674a505ac3589ae878e01aed0131c55bddb diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml index a717e8561b8c..f2aee7a24155 100644 --- a/x11-misc/i3blocks/metadata.xml +++ b/x11-misc/i3blocks/metadata.xml @@ -1,13 +1,9 @@ - - jakov.smolic@sartura.hr - Jakov Smolic - - - proxy-maint@gentoo.org - Proxy Maintainers + + jsmolic@gentoo.org + Jakov Smolić vivien/i3blocks diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest index dd920994de3b..eff4b3901448 100644 --- a/x11-misc/i3lock/Manifest +++ b/x11-misc/i3lock/Manifest @@ -1,3 +1,3 @@ DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d EBUILD i3lock-2.13.ebuild 693 BLAKE2B d52e903c7bdc80e8add5d608392da3ec29964c70edaee54fcd225f68884156482d0094586e57f4a9cbd6b4057fca9993c559579bad4e6cb52c49926972e1e44a SHA512 ad8a941ef22b74bb307ffc4347ce8a72be740104ad83eee449a252b4306491d6435f92fe4be8b46460fcd4cec47f47da944a3f1cc4982d9bef81362cdfa48c39 -MISC metadata.xml 371 BLAKE2B b04850aa939c05c9838378ab56466f245e894ca74e6fb1802adedccf19cd34aa07bed2a9ecc16b0ba7c1b0115f84439fea88f02d9ace78fd239d23d81d205e91 SHA512 2663582751542ae8c76f54017aafd7b34c8d37832a54367240c0c64f6e72dc96f41654328e4a1604776e244b49aa6c1b6e97ac1d68a1fcbf4911c19b0ae6c164 +MISC metadata.xml 353 BLAKE2B cb2046971d3fdb6081e08bf2415854410023c5986a9b00aaa5b0f31d9be34b825d3e31e2a7809305dbf53a498d08d5d9dc0352d4ff9a9677a106093c40f8d4b2 SHA512 bacd6c8ffef26536bc229a75d3cce9f2238b268a76d8519189906d3c190724331f9bc681539402b9d2878a95916a84d80298f46d099dc3e5cf2648170ad63acb diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml index 0799e01923f3..482b18c51bf4 100644 --- a/x11-misc/i3lock/metadata.xml +++ b/x11-misc/i3lock/metadata.xml @@ -1,9 +1,9 @@ - - jakov.smolic@sartura.hr - Jakov Smolic + + jsmolic@gentoo.org + Jakov Smolić marecki@gentoo.org diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest index 2c3644da13b9..488f54da49aa 100644 --- a/x11-misc/py3status/Manifest +++ b/x11-misc/py3status/Manifest @@ -1,3 +1,3 @@ -DIST py3status-3.38.tar.gz 409708 BLAKE2B b031eafcb4a20d69dc38a4ff651040bb11b53a00ab027f139c559c8c15e1c267b9eac748a8e088a272ec497a2ac169f379ba4c5e85a5d8e25b233828e9eefe5d SHA512 dff8200860f8c57f172c10bf20cfafdc2e210b452f547051c3eda2ae45f2e83c04fb4f3d1b1c1cab02a323623be15e809ceee093f2a5c540aed212fe98552dd2 -EBUILD py3status-3.38.ebuild 778 BLAKE2B 8b0c7a516b0d05f1e3848f7ef7e50e3374df19c5a051518d59ab8a4a4c01ea23e277e9f4d02ca4fac98bcf0addaad27ab19bd74170ba4ddbce2ccbce31cd07ff SHA512 589cdc28ce2158df8aa1c3269d6a1ae7d243ef35c15deb89ccc9bf025b01e81103cd20efacb7178cba223dc6217b4cf7d01b4970e9debfcd1f3286d69b1b87ad +DIST py3status-3.39.tar.gz 411035 BLAKE2B 79a7deabd41e6fb8f3384cc7e19c32a52ab46dafebf9b7dcbf4523186e242d467e0ad8a1a77cf2e360154c64c833fc99851da528434806002a41050ed97b6cad SHA512 153f6ebc239190660cef731981dbbb13c1b008ba8180d58471cf596da1508c8c73d4a98e7bd7efb3194512e64905f6179fe19a80baf83ea990a2023e990ff92c +EBUILD py3status-3.39.ebuild 885 BLAKE2B dc620b3442e32ca1e8592a91db209f7cdaab5d23d94945b88ca7d101039f8ab1c43a35aac00e7758aca0c761c02b861aa35bb9274394c58b571d199223d3dfb4 SHA512 e5c24c94b6efa3ef93ea443c7391f460d44c474468ad71aa83020e4018f2c68a75bf15bceb54e28aa290343f329ff473c74a30dcaf49aa0f3df29d07a1ee8181 MISC metadata.xml 757 BLAKE2B 059448fb46b35c9db53995d542d06432e182c022a584351fcd45961f23fca4549ef405eb39aec4fbb59f7e7ec7082428766d917f79fc84ef5ed2684c2030baaa SHA512 3fa373a13f9889d91d863ed3369abb76045447168bd10f62981d14315889d445b523cab315e83afa052baca5881576d398931ee2333a6ec4bf6863e23fb138b5 diff --git a/x11-misc/py3status/py3status-3.38.ebuild b/x11-misc/py3status/py3status-3.38.ebuild deleted file mode 100644 index 249cd9474c6a..000000000000 --- a/x11-misc/py3status/py3status-3.38.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz" - -inherit distutils-r1 - -MY_PN="py3status" -MY_P="${MY_PN}-${PV/_/-}" - -DESCRIPTION="py3status is an extensible i3status wrapper written in python" -HOMEPAGE="https://github.com/ultrabug/py3status" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gevent minimal +udev" - -RDEPEND=" - !minimal? ( x11-misc/i3status ) - gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] ) - udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${MY_P} diff --git a/x11-misc/py3status/py3status-3.39.ebuild b/x11-misc/py3status/py3status-3.39.ebuild new file mode 100644 index 000000000000..c58eef39cc45 --- /dev/null +++ b/x11-misc/py3status/py3status-3.39.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz" + +inherit distutils-r1 + +MY_PN="py3status" +MY_P="${MY_PN}-${PV/_/-}" + +DESCRIPTION="py3status is an extensible i3status wrapper written in python" +HOMEPAGE="https://github.com/ultrabug/py3status" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gevent minimal +udev" +# It feels useless to run tests on this simple package +# since upstream (I) runs tox on CI +RESTRICT="test" + +RDEPEND=" + !minimal? ( x11-misc/i3status ) + gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] ) + udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S=${WORKDIR}/${MY_P} diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index de6c89c94a8a..f3e295e7efba 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -16,9 +16,5 @@ AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a EBUILD xscreensaver-5.45-r4.ebuild 4160 BLAKE2B fdcff85c0e4754ca0363275cf395c132f612b1e7372ae88d21474d077c5c94c9e6aadcd6f214f3d1bb4f8f544a801c96f2d555c9eabc79b5adf925f9743d60f3 SHA512 4f2a0a833641abc2546088d87fcb6094b6d19b5857b840fdb07301135f45b856e95ead0dd466cfc12f9e84197ddfaae6e76b406dada3328a225432d376bffe79 -EBUILD xscreensaver-5.45-r5.ebuild 4159 BLAKE2B 479874f5e3823dbf1b8570d8285a868d7296935d3205a3d090f8ba2bef4491590ddaf7d838fccaf5f1f513aa7de8f09cc7ac62e25f4c9dd13ed5974e5c32b5b0 SHA512 c57b913d19031492a487f22a998fcbc790886cc7b96d238e84e16d57acc0305f587ae03bc9292b9f499c3ebd326ab51de2b5614d0519785b53708dfe5abd1662 -EBUILD xscreensaver-5.45-r6.ebuild 4264 BLAKE2B 2b8226f3b3695ded5884327e557a8bc9741a78ead7a526a5d7a2bea3fd2ac157f9c741802f1352ea6cdf130d5a3c3a147ecf6c934cd74099f336b92eea75c5ef SHA512 b670776352e96fc33ca2223e2f5d164e179015abc52afdd303c2f5782ac983ed60d12f7e1582e3d9bef05d4ce508a2e3ccf2fb586b7435873510c2b3e1cf8d21 -EBUILD xscreensaver-6.01-r1.ebuild 5084 BLAKE2B 3d62384d1c574228b0237effd608229d4b2d740a0d886320eb49226857372a60781f44a84e547cdabaf90863501ea6f10994b5e19b8837c54373d7fa9ff1c670 SHA512 92cd7a2adbf50dbdc474e10201ee04e699261d29759edf25c22e987608578df7916562c872b48384f579accd7bd0ba4d6eed1840ef6b09eaabfc34cee40d0b43 -EBUILD xscreensaver-6.01-r2.ebuild 5178 BLAKE2B 980f127f3238072282a7441308f9814860bd613bc5e530c8aeb7a378d2b0f6b983003e5667b5416542402359cfd37b0aadcd0b6b21e2b3ad3f21364c52909842 SHA512 fb7a433a13ec93c90f59dca6fa4bec80227a7c7e284f2d70c181bb8f50e24439ab5c3fddadad49c0edea51e853c475cff7a023552294993866aae27ee67f52d0 -EBUILD xscreensaver-6.01-r3.ebuild 5847 BLAKE2B 9675cdf7ec5644fed780c848d2e3e36ca237b3f376979288f480b928b2d0ede9833169f74103d53616ea729570aa3c0af6d88b718e318673a1dfab7fcca0efb7 SHA512 88997efcb4840c76671a7ef4d715a8a85cd41ecd2185d6326a8493f9f835ec5e641dc50672281cb3290d9c2c784bc7216da7c71dabc4c149908533dbf70d3617 +EBUILD xscreensaver-6.01-r3.ebuild 5842 BLAKE2B 88a2df9f0043523154eab4783fdf239a56aa44b2bd26917fef1cc89580537acc9f7cc31bab5ba02fd07c3c588d79c74a884dd7e8fb8d34c04816b1bd2c0ee95a SHA512 4f08e5c41aefc38252bdb3e9a4aef1d7d04178813b90196da2a5687b9853bd71c50d018d262505fdad846d25ce1cf09d9a0967c21a763557a6f21545be96158a MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1 diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild deleted file mode 100644 index 5f2c0843d64b..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r5.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic multilib optfeature pam strip-linguas - -DESCRIPTION="modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) -" - -COMMON_DEPEND=" - dev-libs/libxml2 - media-libs/netpbm - virtual/libcrypt:= - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - caps? ( sys-libs/libcap ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-221 ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch - "${FILESDIR}"/${PN}-5.45-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch - "${FILESDIR}"/${PN}-5.44-gentoo.patch - "${FILESDIR}"/${PN}-5.45-gcc.patch - "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch - "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475 -) - -src_prepare() { - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - default - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || break - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_enable locking) \ - $(use_with caps setcap-hacks) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with systemd) \ - $(use_with xinerama xinerama-ext) \ - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} - -pkg_postinst() { - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild deleted file mode 100644 index 55cef2250346..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.45-r6.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic multilib optfeature pam strip-linguas - -DESCRIPTION="modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) -" - -COMMON_DEPEND=" - dev-libs/libxml2 - media-libs/netpbm - virtual/libcrypt:= - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - caps? ( sys-libs/libcap ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-221 ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch - "${FILESDIR}"/${PN}-5.45-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch - "${FILESDIR}"/${PN}-5.44-gentoo.patch - "${FILESDIR}"/${PN}-5.45-gcc.patch - "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch - "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475 -) - -src_prepare() { - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - default - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || die - sed -i \ - 's| Stay.*fucking mask\.$||' \ - hacks/glx/covid19.man \ - hacks/config/covid19.xml || die - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_enable locking) \ - $(use_with caps setcap-hacks) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with systemd) \ - $(use_with xinerama xinerama-ext) \ - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} - -pkg_postinst() { - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild deleted file mode 100644 index dc3965228e89..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-6.01-r1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic font multilib optfeature pam - -DESCRIPTION="modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" - -# Font license mapping for folder ./hacks/fonts/ as following: -# clacon.ttf -- MIT -# gallant12x22.ttf -- unclear, hence dropped -# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) -# OCRAStd.otf -- unclear, hence dropped -# SpecialElite.ttf -- Apache-2.0 -LICENSE="BSD fonts? ( MIT Apache-2.0 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) - elogind? ( !systemd ) -" - -COMMON_DEPEND=" - dev-libs/libxml2 - media-libs/netpbm - virtual/libcrypt:= - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - elogind? ( sys-auth/elogind ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-221 ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-6.01-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-6.01-gentoo.patch - "${FILESDIR}"/${PN}-5.45-gcc.patch - "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch - "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch -) - -src_prepare() { - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - default - - # We are patching driver/XScreenSaver.ad.in, so let's delete the - # header generated from it so that it gets back in sync during build: - rm driver/XScreenSaver_ad.h || die - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || die - sed -i \ - 's| Stay.*fucking mask\.$||' \ - hacks/glx/covid19.man \ - hacks/config/covid19.xml || die - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - - econf \ - $(use_enable locking) \ - $(use_with elogind) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with systemd) \ - $(use_with xinerama xinerama-ext) \ - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - if use fonts; then - # Do not install fonts with unclear licensing - rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die - - # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) - rm -v "${ED}${FONTDIR}"/luximr.ttf || die - - font_xfont_config - else - rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die - fi - - dodoc README{,.hacking} - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} - -pkg_postinst() { - use fonts && font_pkg_postinst - - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi - optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf -} - -pkg_postrm() { - use fonts && font_pkg_postrm -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild deleted file mode 100644 index 628041e77c80..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-6.01-r2.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic font multilib optfeature pam - -DESCRIPTION="modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" - -# Font license mapping for folder ./hacks/fonts/ as following: -# clacon.ttf -- MIT -# gallant12x22.ttf -- unclear, hence dropped -# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) -# OCRAStd.otf -- unclear, hence dropped -# SpecialElite.ttf -- Apache-2.0 -LICENSE="BSD fonts? ( MIT Apache-2.0 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) - elogind? ( !systemd ) -" - -COMMON_DEPEND=" - dev-libs/libxml2 - media-libs/netpbm - virtual/libcrypt:= - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - elogind? ( sys-auth/elogind ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-221 ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-6.01-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-6.01-gentoo.patch - "${FILESDIR}"/${PN}-5.45-gcc.patch - "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch - "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch - "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch - "${FILESDIR}"/${PN}-6.01-gtk-detection.patch -) - -src_prepare() { - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - default - - # We are patching driver/XScreenSaver.ad.in, so let's delete the - # header generated from it so that it gets back in sync during build: - rm driver/XScreenSaver_ad.h || die - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || die - sed -i \ - 's| Stay.*fucking mask\.$||' \ - hacks/glx/covid19.man \ - hacks/config/covid19.xml || die - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - - econf \ - $(use_enable locking) \ - $(use_with elogind) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with systemd) \ - $(use_with xinerama xinerama-ext) \ - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - if use fonts; then - # Do not install fonts with unclear licensing - rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die - - # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) - rm -v "${ED}${FONTDIR}"/luximr.ttf || die - - font_xfont_config - else - rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die - fi - - dodoc README{,.hacking} - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} - -pkg_postinst() { - use fonts && font_pkg_postinst - - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi - optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf -} - -pkg_postrm() { - use fonts && font_pkg_postrm -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild index 609e6c132c7f..7f884228e1ae 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama" REQUIRED_USE=" gdk-pixbuf? ( gtk ) -- cgit v1.2.3