diff options
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/cinnamon-screensaver/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-extra/cinnamon-screensaver/Manifest | 22 | ||||
| -rw-r--r-- | gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild (renamed from gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.1.ebuild) | 44 |
3 files changed, 47 insertions, 27 deletions
diff --git a/gnome-extra/cinnamon-screensaver/ChangeLog b/gnome-extra/cinnamon-screensaver/ChangeLog index 1a73e64e7346..c3b76b42befe 100644 --- a/gnome-extra/cinnamon-screensaver/ChangeLog +++ b/gnome-extra/cinnamon-screensaver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/cinnamon-screensaver # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.16 2015/06/26 09:22:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.17 2015/07/04 19:20:22 pacho Exp $ + +*cinnamon-screensaver-2.6.4 (04 Jul 2015) + + 04 Jul 2015; Pacho Ramos <pacho@gentoo.org> + +cinnamon-screensaver-2.6.4.ebuild, -cinnamon-screensaver-2.4.1.ebuild: + Version bump, drop old 26 Jun 2015; Agostino Sarubbo <ago@gentoo.org> cinnamon-screensaver-2.4.2.ebuild: diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest index abe93229c8e6..73a5fa3509c0 100644 --- a/gnome-extra/cinnamon-screensaver/Manifest +++ b/gnome-extra/cinnamon-screensaver/Manifest @@ -2,28 +2,18 @@ Hash: SHA256 AUX cinnamon-screensaver-2.6.3-automagic-logind.patch 1124 SHA256 99d43c908427f15c8ab103e6b4d7e8e4a1a887b00173de89b0bee6ba68d685e7 SHA512 56c6a2ec1ed5b98583912935f3bcd7d7143d3d2a86bbe48809d39e29d2f451210b83155ec3fbdd1c05c720ec18c458b9be21e948d22db1f546409030889b36cc WHIRLPOOL cb05b9c526d7dcd6731cefa22f2af3274727c9ed8b30fb70a78a4059e86cc0ad28f7d30e5f63c87c6123d8239134a92e8e601a7fe9cf970c8dbf592291250de3 -DIST cinnamon-screensaver-2.4.1.tar.gz 142276 SHA256 e73c5d483cd4faeb8d7a4fec9bb1ab73df5cef5d05a3ab268f7a29947d2a483e SHA512 816cca80f2fe7bd333c3e23cea88e18262cb43b776d3280ab25bf8757aec338e24bb4fff867c6113b98b4f5d4988859e3c0ab41e552ee4f4ce122ba1cb4c2be7 WHIRLPOOL 6c56f2676242a8bf6e2666e819c17448d935046a4d552aec78403b9567ff8bd23e13d01cc224dc284331da57932d4b320fe8a25efae9169a091b3bfe917747c6 DIST cinnamon-screensaver-2.4.2.tar.gz 142557 SHA256 52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda SHA512 54131d1c8aab2abf31210031f0888e9913535ce2697e3310c6f86a9edefe832fc46b0340af792d88d97788aa65c15d210e703dc3b15d419f08f64352444ccc61 WHIRLPOOL 56f87bc6fdf5eba04cd68df9546d6451ba1d7c146903813b76e368e6a71f45a97814923cdfa5bba881d4e53761b3c711a51a139e38c09c3ecc29902aa3b9949d DIST cinnamon-screensaver-2.6.3.tar.gz 145989 SHA256 cef3e6ccbb77e91f7e4ef04115b45696c5b6070b8517a60c8782b1f0a67a348a SHA512 d18fac08f7a56e79629b1e78c7ea69bb14c8e906a56252d523bc1129e97f58a3f6a6dc9b9adc21b3e2fb8826783e74375abb50b5b14d35f178522eb5c6d7e509 WHIRLPOOL 4b534d363f04dbd7f3785e19c9ebd847f78b8263aadcf8f9e1ab80dc4183a866f8d269704ebe5bdb9c18b5f5dcd44b5908f5859d72d16f775e2d7d3052614b5b -EBUILD cinnamon-screensaver-2.4.1.ebuild 2163 SHA256 446b815b452d3308a997aad45837ada17d79cce7b0a15d9d452d98c36300ae5f SHA512 98e9cd427e8df0c98412e1f42b6ab406a05c0df230a420d1bc3e78cd216b1907c4799a87d8ba786da0064995e796d705d35e23c04926ccc7befd8dd89da45c7c WHIRLPOOL 2265c67dcdba9e564caaa61971684f26234e137d88a0b460821da7625615d521687cfb91d4b03223f44e9e89407ec9438e1b2bef2f78a61167b5b937fa8994f6 +DIST cinnamon-screensaver-2.6.4.tar.gz 146059 SHA256 b5da1cd64ab20e52582088c1fa8ac79741b1a17cc018a8f370936d9707dbbbde SHA512 dca368928fc7edeaa83a36d2045926bd041e1a73815484be8ef37c758d75922ab54a196ebe075522e7363faa224547b94934b54019c417ba0da200c8ebf3b403 WHIRLPOOL c570c6803d8c8ce74a2d2143622bdfa0157b243f95e44ac84969c7426bbc6d0a8e7dad27fc9c0b61b1c750f4c37d5446f703d95ad1b93d55393b56266b868986 EBUILD cinnamon-screensaver-2.4.2.ebuild 2018 SHA256 6b10e27ca57b4e2e7cac5ea822a8f9198adab6ce0b9ae506885734b518bbceea SHA512 4e7856ae7822124c1148f7fe07ce3d3739b0f97f11f7c902ab6aefe085890a5723ba2012a8e4a8a90dece7b124503352228bf7f34452d173f094df1fb15c2286 WHIRLPOOL b5fc532ae9599cf6797ee32862c2f9554a5816eeb2f82c7d85ba7276b49bcdb76f32ab7c41bf7637cbf3054c7347f46493f393860aa000bf1323eeca6d313303 EBUILD cinnamon-screensaver-2.6.3.ebuild 2682 SHA256 81c594a2d32bb242b62ec1ce9c48ed951bb0ef4a1f45604438ac6c6a0f2f025f SHA512 064589f1fe622d8485d94961d8896135fa6c5f9fa0fa7ce898b595e1f08a89c5757a52b27de18614a95436de34908aae4fac70a5d561cd876aa9d40769740b7b WHIRLPOOL fb6ee892b5b6bb124e9e3ef6ab91790a422c4b5d101e6eaf02227401f7dcc183ef47aaad1b9dad00278a1193abbd730c79d5c9d287a3263c08a70d19f23329bb -MISC ChangeLog 2796 SHA256 2580f92bf3cf804a768a41e2afb6c89d50f57381647258a834b733c1b82ecaa0 SHA512 0b9d1a9b1c94b6ab286587c36056e236eb251ec24e704b1c94aa0df3a9257f1288f1c8ac49e59c6d5dde19cc166b3e99fc848d56a9f6e257a4052ec5a26b7f8c WHIRLPOOL 855a3a3575b6bf3ab74ad4e075ef89894e308763a9c9a107324f740b7ba61910e8fac1eff995d674e9becebff5a755bd9c09ce3465322115e47c49900750d40d +EBUILD cinnamon-screensaver-2.6.4.ebuild 2677 SHA256 eadb98b3111f39f3689f8cc8d7bf2a3797574931a21b8627fb13a69a31133897 SHA512 1d40cffa8d0574746d9899127995dbdb28ee80a1019808dbc8b4630f554d27e5b7ab71be12e01a20221a8fa78d546c42037f8eb38b5f6b98a913879144dbf604 WHIRLPOOL c903d2a7989d01d7a5de5d99d28407ea83cbb30e7013f3e9c166beb51dbfbe69bced1cca7abc841d5fca179aaa498585c9371cd7091ca039bc8e2cd659464971 +MISC ChangeLog 2987 SHA256 e6537bc9a8f1a5ae4655a8c77a5d35217017ec38b96c862321b17223ee5881ae SHA512 637e0ca04029f8de0754e97c4d5617faf96ac81a89a2f6b770f32d11f5f6a60dd9f6d4f082a3777deea30b067c8e472869d79673bb2015088c7ca178c7e1affe WHIRLPOOL 268bf8ee7fe9f535f4cb1a925e853362f9ba5ff52fd72424f9bd81954bc154500703e438d7b41a150e3e25fabcfd8027d35fc93026ee5982ec2729557cbec4ce MISC metadata.xml 254 SHA256 33b1812c323a9d7f56f6b8fddf908895dd5a938604c8fc6a2c1091d0fb6e7670 SHA512 258ede1a8681bc70068ddfa6d3be80194e8d132d67fea8ccd619aee1573a44940252a24c6e21dead416a2082444e8df97004106182f7e52ba845e3ce7a639c7b WHIRLPOOL d266f71bd25f35e81a9b94e76226add110401e563e8dd8daa9d7baa7d61f50fe3cefe66534433263cb21e9ce07cbc670fa2a074236e5af3dd658183cff6f1b65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVjRnKAAoJELp701BxlEWf0RUP/2lYtdEZdfmztZh6ytkkrRfm -Sr8Pcw68lsQOTC2PIIYyMIpuzPpK9YL0Qbm9c69r1FItMWMdynJvv+/N0sqEQ5IQ -8Su6Iuq/9YtOaPnIqusxr6ulAkdWoIoik74/Hvt3fWPDUBwTJ1M1VWmcapR16eRG -sQWJsnmZfx0qAfFpxTNXfThKS96UihXzSZgi8KcmDTak1hfgFgHeyavUdi89Wjm0 -jAA0TDm1erFKklE4R+V+RgfhOTikl8PzxtMh7pij5Ltryjfz7Kd/glrmWJ6gBrcx -BoVf7BWRpj60Exfew4pjTUKG8uaUj941MKRAJT42Au5FWS7x/YYdakAWpZ+A8Zi4 -EuwnJNEFTBNjeGyXZtSEMryEehHaIlCePeYlfNLdG48PTFPEEP8NoEb/W0i7030L -fZRV7J8b/oCsuJ+TGuLHn91m9UEywC1ALl7L97d9hNki/G6JmoG5IMkp6bxpmsHl -frY8LJeaqshs7dmbnQ738OppKuIOf6vdqhHvsG52fN6aP4RxrO5pDXp8EqK3nJqf -IicRYzcs7XpQMmxDfo9zXFwPTD4fsDlLd9qfg/Tzc/L8CbBzibs5DlHolVj0wsWK -CcwfX9z2TXtqY6c+f9V2nHyGaEeUgRxNUSQXXTGADzyTBmSeI8YO6FnqF7DjOFx8 -bdyi7uLM/qLdcn54oyF6 -=p/eB +iEYEAREIAAYFAlWYMfcACgkQCaWpQKGI+9RXswCdE+5bpv+Uwdp4K2JkHNzBTA+H +s3wAnjtj5H1bp/NW3GNNh5krYFTqrR6d +=5fJM -----END PGP SIGNATURE----- diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild index b2527e2f0017..a32a26c8bfb6 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.1.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.1.ebuild,v 1.3 2015/03/15 13:24:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild,v 1.1 2015/07/04 19:20:22 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" +PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils gnome2 +inherit autotools eutils gnome2 multilib python-single-r1 DESCRIPTION="Screensaver for Cinnamon" HOMEPAGE="http://cinnamon.linuxmint.com/" @@ -14,15 +15,17 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz LICENSE="GPL-2+" SLOT="0" IUSE="doc pam systemd" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" COMMON_DEPEND=" - >=dev-libs/glib-2.25.6:2 - >=x11-libs/gtk+-2.99.3:3 - >=gnome-extra/cinnamon-desktop-2.4:0= + >=dev-libs/glib-2.37.3:2[dbus] + >=x11-libs/gtk+-3.1.4:3[introspection] + >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 - >=dev-libs/dbus-glib-0.71 + >=dev-libs/dbus-glib-0.78 + + net-libs/webkit-gtk:3[introspection] sys-apps/dbus x11-libs/libxklavier @@ -34,6 +37,8 @@ COMMON_DEPEND=" x11-libs/libXxf86vm x11-themes/gnome-icon-theme-symbolic + ${PYTHON_DEPS} + pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) " @@ -41,6 +46,8 @@ COMMON_DEPEND=" RDEPEND=" !~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit ) + + dev-python/pygobject:3[${PYTHON_USEDEP}] " DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35 @@ -57,9 +64,18 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.4 ) " +pkg_setup() { + python_setup +} + src_prepare() { - # https://github.com/linuxmint/cinnamon-screensaver/issues/80 - sed -i -e 's/X-Cinnamon/X-Cinnamon;/' src/cinnamon-screensaver.desktop.in.in || die + epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch + + # Fix xscreensaver paths for gentoo + sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr$(get_libdir)/misc/xscreensaver/#" \ + -i data/screensavers/xscreensaver@cinnamon.org/main || die + + python_fix_shebang data/screensavers epatch_user eautoreconf @@ -71,7 +87,7 @@ src_configure() { gnome2_src_configure \ $(use_enable doc docbook-docs) \ $(use_enable pam locking) \ - $(use_with systemd) \ + $(use_enable systemd logind) \ --with-mit-ext \ --with-pam-prefix=/etc \ --with-xf86gamma-ext \ @@ -80,3 +96,11 @@ src_configure() { # no build-time or run-time check for consolekit, $PN merely listens to # consolekit's messages over dbus. } + +pkg_postinst() { + gnome2_pkg_postinst + + if ! has_version x11-misc/xscreensaver; then + elog "${PN} can use screensavers from x11-misc/xscreensaver" + fi +} |