diff options
Diffstat (limited to 'mate-extra/mate-screensaver')
| -rw-r--r-- | mate-extra/mate-screensaver/Manifest | 4 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch | 33 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch | 11 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch | 11 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/mate-screensaver-1.23.1.ebuild | 119 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild | 24 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild (renamed from mate-extra/mate-screensaver/mate-screensaver-1.23.1-r1.ebuild) | 36 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/mate-screensaver-9999.ebuild | 112 | ||||
| -rw-r--r-- | mate-extra/mate-screensaver/metadata.xml | 23 |
9 files changed, 43 insertions, 330 deletions
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest index b55c4311bd1f..8c0937675128 100644 --- a/mate-extra/mate-screensaver/Manifest +++ b/mate-extra/mate-screensaver/Manifest @@ -1,4 +1,2 @@ -DIST mate-screensaver-1.22.1.tar.xz 4942928 BLAKE2B e82b6482ed9ec655bb8bea2795b0e2559cbdfcb2be5f27a2264486a2013b8234cb02292b6ca547f8812e6dc0c74646f51af8a2f8d7baf2f28bf1b688508350d5 SHA512 7ffb94d88095ff5580862fe9c958a2e4af7a424d40dc5e0f3c1da49a258035179573721fc7052710624916678e953a6347a898b53ff872a49e022987b8c02904 -DIST mate-screensaver-1.22.2.tar.xz 4943380 BLAKE2B 20d28ee7496af9fd9ac23d4f083eaee716eb97e1c3a9b921fc6b3655cfe4c6dc6e482827eb7fad40fbfd5dfb705bcac57aff3bf60e232b84562e496a7a56c354 SHA512 6d28f7261556d59af0bdb8c59ac13fc042c9c5b4cce47e7f6d4148041eb7f05d5cb062f85f05dddb51d009e4aebac31c21fc1243c0e07813adc050fede134ef3 -DIST mate-screensaver-1.23.1.tar.xz 4944648 BLAKE2B b287d672ab08db7c3c4580e5c34a690aa1dda1e3ba4cde2d3771fdc4cfb4dd62a85c0a86a25aa772adb664be1a776e41961256cac203cfd1bdd44bfbe0d28472 SHA512 7d977cf73529307a51a9fcefc78948e94d29dcf1ae1c082dc18c6b04a5b888129ffcab6a8cf63187e0814abe45ff60f680fdffb6400375733b2d823f384608b6 DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0 +DIST mate-screensaver-1.24.1.tar.xz 5073836 BLAKE2B 501c8dffbb5e53b88414c799a6e4d25cf89dfe490e6a902901c339b142e2b687dc2e668f65349a2ff43b6eb44d7721658de771b1a698624f95d1828da2fbda67 SHA512 f7cab280da90623ad265beb84770e48431ae6685fbb1eabc7cd2ad07b0f8ed5da2426017243d83271b969d2e020b8afcc93a6135b4c8e42a29f454a4e826b277 diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch deleted file mode 100644 index a5cf836d734a..000000000000 --- a/mate-extra/mate-screensaver/files/mate-screensaver-1.10-fix-systemd-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 95b8f96ad66ab555c763dafebac8a49b9c6f3d51 Mon Sep 17 00:00:00 2001 -From: Monsta <monsta@inbox.ru> -Date: Thu, 1 Oct 2015 11:20:49 +0300 -Subject: [PATCH] configure.ac: add support for new libsystemd library - -From 6d4a81780e3598435b565569e8e16f1410cb5761 Mon Sep 17 00:00:00 2001 -From: Monsta <monsta@inbox.ru> -Date: Mon, 5 Oct 2015 16:30:14 +0300 -Subject: [PATCH] fix build w/o systemd support - -fixes https://github.com/mate-desktop/mate-screensaver/issues/83 - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 379f9b1..87ab770 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -934,9 +934,9 @@ AC_ARG_WITH(systemd, - [Add systemd support]), - [with_systemd=$withval], [with_systemd=auto]) - --PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login], -- [have_systemd=yes], [have_systemd=no]) -+PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], -+ [PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login], -+ [have_systemd=yes], [have_systemd=no])]) - - if test "x$with_systemd" = "xauto" ; then - if test x$have_systemd = xno ; then diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch deleted file mode 100644 index 5d13f69486b6..000000000000 --- a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -burN a/savers/popsquares.c b/savers/popsquares.c ---- a/savers/popsquares.c 2012-03-07 22:28:11.000000000 +0100 -+++ b/savers/popsquares.c 2012-07-17 19:54:44.062628969 +0200 -@@ -21,6 +21,7 @@ - - #include "config.h" - -+#include <stdlib.h> - #include <string.h> - #include <gdk/gdk.h> - #include <gdk/gdkx.h> diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch deleted file mode 100644 index 45638c0ea10e..000000000000 --- a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac 2012-08-08 19:23:14.026623125 +0200 -+++ b/configure.ac 2012-08-08 19:23:20.766623326 +0200 -@@ -545,7 +545,7 @@ - dnl - Check for GL - dnl --------------------------------------------------------------------------- - --AC_ARG_WITH(gl, [ --with-libgl build with GL support]) -+AC_ARG_WITH(libgl, [ --with-libgl build with GL support]) - have_libgl=no - GL_LIBS="" - diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.23.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.23.1.ebuild deleted file mode 100644 index 9ce8ddaf71aa..000000000000 --- a/mate-extra/mate-screensaver/mate-screensaver-1.23.1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate readme.gentoo-r1 - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" - -LICENSE="GPL-2" -SLOT="0" -IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd" -REQUIRED_USE="?? ( elogind systemd )" - -DOC_CONTENTS=" - Information for converting screensavers is located in - /usr/share/doc/${PF}/xss-conversion.txt* -" - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.71:0 - >=dev-libs/glib-2.50:2 - gnome-base/dconf - >=mate-base/libmatekbd-1.17.0 - >=mate-base/mate-desktop-1.17.0 - >=mate-base/mate-menus-1.21.0 - >=sys-apps/dbus-0.30 - >=x11-libs/gdk-pixbuf-2.14:2 - >=x11-libs/libX11-1 - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-libs/libXxf86misc - x11-libs/libXxf86vm - x11-libs/libxklavier - x11-libs/pango - virtual/libintl - consolekit? ( sys-auth/consolekit ) - libnotify? ( >=x11-libs/libnotify-0.7:0 ) - opengl? ( virtual/opengl ) - pam? ( gnome-base/gnome-keyring sys-libs/pam ) - !pam? ( kernel_linux? ( sys-apps/shadow ) ) - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd:= ) - !!<gnome-extra/gnome-screensaver-3" - -RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-session-manager-1.6" - -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50.1 - sys-devel/gettext:* - x11-base/xorg-proto - virtual/pkgconfig:*" - -src_configure() { - local myconf=( - --enable-locking - --with-kbd-layout-indicator - --with-xf86gamma-ext - --with-xscreensaverdir=/usr/share/xscreensaver/config - --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver - $(use_with X x) - $(use_with consolekit console-kit) - $(use_with elogind) - $(use_with libnotify) - $(use_with opengl libgl) - $(use_with systemd) - $(use_enable debug) - $(use_enable pam) - ) - - mate_src_configure "${myconf[@]}" -} - -src_install() { - mate_src_install - - # Install the conversion script in the documentation. - dodoc "${S}"/data/migrate-xscreensaver-config.sh - dodoc "${S}"/data/xscreensaver-config.xsl - dodoc "${FILESDIR}"/xss-conversion.txt - - # Non PAM users will need this suid to read the password hashes. - # OpenPAM users will probably need this too when - # https://bugzilla.gnome.org/show_bug.cgi?id=370847 - # is fixed. - if ! use pam ; then - fperms u+s /usr/libexec/mate-screensaver-dialog - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - mate_pkg_postinst - - if has_version "<x11-base/xorg-server-1.5.3-r4" ; then - ewarn "You have a too old xorg-server installation. This will cause" - ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." - echo - fi - - if has_version "<x11-misc/xscreensaver-4.22-r2" ; then - ewarn "You have xscreensaver installed, you probably want to disable it." - ewarn "To prevent a duplicate screensaver entry in the menu, you need to" - ewarn "build xscreensaver with -gnome in the USE flags." - ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" - echo - fi - - readme.gentoo_print_elog -} diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild index 16e1e40cdfdb..c496eac13b11 100644 --- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild +++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild @@ -6,14 +6,14 @@ EAPI=6 inherit mate readme.gentoo-r1 if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" -LICENSE="GPL-2" +LICENSE="GPL-2+ HPND LGPL-2+" SLOT="0" -IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd" +IUSE="X debug elogind kernel_linux libnotify opengl pam systemd" REQUIRED_USE="?? ( elogind systemd )" DOC_CONTENTS=" @@ -39,24 +39,26 @@ COMMON_DEPEND=" x11-libs/libXxf86vm x11-libs/libxklavier x11-libs/pango - virtual/libintl - consolekit? ( sys-auth/consolekit ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl ) pam? ( gnome-base/gnome-keyring sys-libs/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) - !!<gnome-extra/gnome-screensaver-3" +" RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-session-manager-1.6" + >=mate-base/mate-session-manager-1.6 + virtual/libintl + !!<gnome-extra/gnome-screensaver-3 +" DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50.1 - sys-devel/gettext:* + dev-libs/libxml2 + >=sys-devel/gettext-0.19.8:* x11-base/xorg-proto - virtual/pkgconfig:*" + virtual/pkgconfig:* +" src_configure() { local myconf=( @@ -65,8 +67,8 @@ src_configure() { --with-xf86gamma-ext --with-xscreensaverdir=/usr/share/xscreensaver/config --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver + --without-console-kit $(use_with X x) - $(use_with consolekit console-kit) $(use_with elogind) $(use_with libnotify) $(use_with opengl libgl) diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.23.1-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild index 5c356ed4cc9d..b17ccf088202 100644 --- a/mate-extra/mate-screensaver/mate-screensaver-1.23.1-r1.ebuild +++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,21 +6,16 @@ EAPI=6 inherit mate readme.gentoo-r1 if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" -LICENSE="GPL-2" +LICENSE="GPL-2+ HPND LGPL-2+" SLOT="0" -IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd" +IUSE="X debug elogind kernel_linux libnotify opengl pam systemd" REQUIRED_USE="?? ( elogind systemd )" -DOC_CONTENTS=" - Information for converting screensavers is located in - /usr/share/doc/${PF}/xss-conversion.txt* -" - COMMON_DEPEND=" >=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.50:2 @@ -39,24 +34,31 @@ COMMON_DEPEND=" x11-libs/libXxf86vm x11-libs/libxklavier x11-libs/pango - virtual/libintl - consolekit? ( sys-auth/consolekit ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl ) pam? ( gnome-base/gnome-keyring sys-libs/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) - !!<gnome-extra/gnome-screensaver-3" +" RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-session-manager-1.6" + >=mate-base/mate-session-manager-1.6 + virtual/libintl + !!<gnome-extra/gnome-screensaver-3 +" DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50.1 - sys-devel/gettext:* + dev-libs/libxml2 + >=sys-devel/gettext-0.19.8:* x11-base/xorg-proto - virtual/pkgconfig:*" + virtual/pkgconfig:* +" + +DOC_CONTENTS=" + Information for converting screensavers is located in + /usr/share/doc/${PF}/xss-conversion.txt* +" src_configure() { local myconf=( @@ -65,8 +67,8 @@ src_configure() { --with-xf86gamma-ext --with-xscreensaverdir=/usr/share/xscreensaver/config --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver + --without-console-kit $(use_with X x) - $(use_with consolekit console-kit) $(use_with elogind) $(use_with libnotify) $(use_with opengl libgl) diff --git a/mate-extra/mate-screensaver/mate-screensaver-9999.ebuild b/mate-extra/mate-screensaver/mate-screensaver-9999.ebuild deleted file mode 100644 index 3572f36e1fcf..000000000000 --- a/mate-extra/mate-screensaver/mate-screensaver-9999.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate multilib readme.gentoo-r1 - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" -LICENSE="GPL-2" -SLOT="0" - -IUSE="X debug consolekit kernel_linux libnotify opengl pam systemd" - -DOC_CONTENTS=" - Information for converting screensavers is located in - /usr/share/doc/${PF}/xss-conversion.txt* -" - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.71:0 - >=dev-libs/glib-2.36:2 - gnome-base/dconf:0 - >=mate-base/libmatekbd-1.17.0 - >=mate-base/mate-desktop-1.17.0 - >=mate-base/mate-menus-1.10.0 - >=sys-apps/dbus-0.30:0 - >=x11-libs/gdk-pixbuf-2.14:2 - >=x11-libs/libX11-1:0 - x11-libs/cairo:0 - >=x11-libs/gtk+-3.14:3 - x11-libs/libXext:0 - x11-libs/libXrandr:0 - x11-libs/libXScrnSaver:0 - x11-libs/libXxf86vm:0 - x11-libs/libxklavier:0 - x11-libs/pango:0 - virtual/libintl:0 - consolekit? ( sys-auth/consolekit:0 ) - libnotify? ( >=x11-libs/libnotify-0.7:0 ) - opengl? ( virtual/opengl:0 ) - pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) - !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) - systemd? ( sys-apps/systemd:0= ) - !!<gnome-extra/gnome-screensaver-3:0" - -RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-session-manager-1.6" - -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50.1:* - sys-devel/gettext:* - x11-base/xorg-proto:0 - virtual/pkgconfig:*" - -src_configure() { - mate_src_configure \ - --enable-locking \ - --with-kbd-layout-indicator \ - --with-xf86gamma-ext \ - --with-xscreensaverdir=/usr/share/xscreensaver/config \ - --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \ - $(use_with X x) \ - $(use_with consolekit console-kit) \ - $(use_with libnotify) \ - $(use_with opengl libgl) \ - $(use_with systemd) \ - $(use_enable debug) \ - $(use_enable pam) -} - -src_install() { - mate_src_install - - # Install the conversion script in the documentation. - dodoc "${S}"/data/migrate-xscreensaver-config.sh - dodoc "${S}"/data/xscreensaver-config.xsl - dodoc "${FILESDIR}"/xss-conversion.txt - - # Non PAM users will need this suid to read the password hashes. - # OpenPAM users will probably need this too when - # http://bugzilla.gnome.org/show_bug.cgi?id=370847 - # is fixed. - if ! use pam ; then - fperms u+s /usr/libexec/mate-screensaver-dialog - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - mate_pkg_postinst - - if has_version "<x11-base/xorg-server-1.5.3-r4" ; then - ewarn "You have a too old xorg-server installation. This will cause" - ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." - echo - fi - - if has_version "<x11-misc/xscreensaver-4.22-r2" ; then - ewarn "You have xscreensaver installed, you probably want to disable it." - ewarn "To prevent a duplicate screensaver entry in the menu, you need to" - ewarn "build xscreensaver with -gnome in the USE flags." - ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" - echo - fi - - readme.gentoo_print_elog -} diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml index 98dd5db86943..75776a7486eb 100644 --- a/mate-extra/mate-screensaver/metadata.xml +++ b/mate-extra/mate-screensaver/metadata.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <use> - <flag name="consolekit">Enable support for - <pkg>sys-auth/consolekit</pkg></flag> - </use> - <upstream> - <remote-id type="github">mate-desktop/mate-screensaver</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-screensaver</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file |