commit: 11241a86e4b48f4fedf103dabccbd147aed4e836 Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> AuthorDate: Fri Oct 21 19:19:30 2016 +0000 Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 22:20:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11241a86
mate-extra/mate-screensaver: Drop 1.10.x Package-Manager: portage-2.3.1 mate-extra/mate-screensaver/Manifest | 1 - ...screensaver-1.10-fix-systemd-configure.ac.patch | 33 ------ ...screensaver-1.2.0-fix-popsquares-includes.patch | 11 -- .../mate-screensaver-1.2.0-fix-with-libgl.patch | 11 -- .../mate-screensaver-1.10.2-r2.ebuild | 125 --------------------- 5 files changed, 181 deletions(-) diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest index 53b9358..ee9ec22 100644 --- a/mate-extra/mate-screensaver/Manifest +++ b/mate-extra/mate-screensaver/Manifest @@ -1,3 +1,2 @@ -DIST mate-screensaver-1.10.2.tar.xz 4888108 SHA256 19b79dc4b4b5a6dcd407daf5b8f310b6da8210445a6271d265458e79a58d539d SHA512 474d0db2aa42bce2ab6185badc8a10d921ec1450d2b873c167047e7f29d5f9d5dd3ef608f8a9d232221fc4be82171343cba45c5598cb745b38d85f5baf900f47 WHIRLPOOL 7ba45db491251942ce0373a80a47268a0c2c9f5315495d3621174a07b580722a785193da7f2a47bf0c65f22312c91813480205e1ad9117b1d36c04fbab5994ff DIST mate-screensaver-1.12.0.tar.xz 4868924 SHA256 198cb5159bd6321c90e0069115909be52eb4382de25cb9c4ba33fa29e3fdc693 SHA512 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d WHIRLPOOL 2cf7db69a1609cd785eef50c070743722cd190633a3b34b4cc87c11aa46164106a785dd027e728121e18a671c1b36cd5d20d30f232011a1ac6a4ff5f37953dc4 DIST mate-screensaver-1.14.1.tar.xz 4912772 SHA256 e903932d9e3b01b527abf8b4957d68797afd1b6b035854bcbbd5e4e6934da5c6 SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8 WHIRLPOOL c39b1f2ee9bb3082a038c765c9c007c500470ab4c73d5221d3d5e49de9c54fa950e9eeabec9f02f4791f7ade984076574ad8c25357af43bf5ff39d3623cff74b 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 a5cf836..00000000 --- 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 <[email protected]> -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 <[email protected]> -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 5d13f69..00000000 --- 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 45638c0..00000000 --- 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.10.2-r2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild deleted file mode 100644 index 43d4074..00000000 --- a/mate-extra/mate-screensaver/mate-screensaver-1.10.2-r2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="yes" - -inherit gnome2 multilib autotools readme.gentoo versionator - -MATE_BRANCH="$(get_version_component_range 1-2)" - -SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"; -DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" -HOMEPAGE="http://mate-desktop.org"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" - -IUSE="X consolekit kernel_linux libnotify opengl pam systemd" - -DOC_CONTENTS=" - Information for converting screensavers is located in - /usr/share/doc/${PF}/xss-conversion.txt* -" - -RDEPEND=" - >=dev-libs/dbus-glib-0.71:0 - >=dev-libs/glib-2.36:2 - gnome-base/dconf:0 - >=mate-base/libmatekbd-1.10:0 - >=mate-base/mate-desktop-1.10:0 - >=mate-base/mate-menus-1.10:0 - >=mate-base/mate-session-manager-1.10:0 - >=sys-apps/dbus-0.30:0 - >=x11-libs/gdk-pixbuf-2.14:2 - >=x11-libs/gtk+-2.24:2 - >=x11-libs/libX11-1:0 - x11-libs/cairo:0 - x11-libs/libXext:0 - x11-libs/libXrandr:0 - x11-libs/libXScrnSaver:0 - x11-libs/libXxf86misc: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" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35:* - >=mate-base/mate-common-1.10:0 - sys-devel/gettext:* - x11-proto/randrproto:0 - x11-proto/scrnsaverproto:0 - x11-proto/xextproto:0 - x11-proto/xf86miscproto:0 - virtual/pkgconfig:*" - -src_prepare() { - gnome2_src_prepare - epatch "${FILESDIR}/mate-screensaver-1.10-fix-systemd-configure.ac.patch" - eautoreconf -} - -src_configure() { - gnome2_src_configure \ - $(use_with consolekit console-kit) \ - $(use_enable debug) \ - $(use_with libnotify) \ - $(use_with opengl libgl) \ - $(use_enable pam) \ - $(use_with systemd) \ - $(use_with X x) \ - --enable-locking \ - --with-kbd-layout-indicator \ - --with-xf86gamma-ext \ - --with-xscreensaverdir=/usr/share/xscreensaver/config \ - --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver -} - -src_install() { - gnome2_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() { - gnome2_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 -}
