From 97074a0d56f78b6324bed46d05507be337e3bd08 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 15 Mar 2015 18:53:39 +0000 Subject: Revbump and block libxfce4ui-4.12.0 to force rebuilding against non-broken libxfce4ui. Add slot operators. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- xfce-base/xfce4-session/ChangeLog | 9 ++- xfce-base/xfce4-session/Manifest | 32 +++++----- .../xfce4-session/xfce4-session-4.12.0-r1.ebuild | 71 ++++++++++++++++++++++ .../xfce4-session/xfce4-session-4.12.0.ebuild | 70 --------------------- 4 files changed, 95 insertions(+), 87 deletions(-) create mode 100644 xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild delete mode 100644 xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild (limited to 'xfce-base') diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog index 426278b3e0f8..f6d1f41b6a8b 100644 --- a/xfce-base/xfce4-session/ChangeLog +++ b/xfce-base/xfce4-session/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/xfce4-session # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.227 2015/03/08 15:06:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.228 2015/03/15 18:53:38 mgorny Exp $ + +*xfce4-session-4.12.0-r1 (15 Mar 2015) + + 15 Mar 2015; Michał Górny +xfce4-session-4.12.0-r1.ebuild, + -xfce4-session-4.12.0.ebuild: + Revbump and block libxfce4ui-4.12.0 to force rebuilding against non-broken + libxfce4ui. Add slot operators. *xfce4-session-4.12.0 (08 Mar 2015) diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index 4d836acd084a..d351dabe18aa 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -9,25 +9,25 @@ DIST xfce4-session-4.11.0.tar.bz2 1213569 SHA256 c68905b5124382e30e90f7e4f080fd7 DIST xfce4-session-4.12.0.tar.bz2 1247710 SHA256 68c85453b097d3ada573dcb7e72acd06e0fc34531996122c10d20096405b7b06 SHA512 7c74991d4c105d993985a3bbd2a7b7730ebd1c84194289e883359737f8ad8683f3c728f53f4967dc7d2967258a04172d8ac8ddf8a9af56888d808f7db53850de WHIRLPOOL 144a67e66dd352020fdd41584b2ed3e0ba73673c2d029379b1122edd0c3b5db41a20ef79832d6b0b04c87062ec65fa926d0b4d7aefbe0e79b499c48cdfe5befa EBUILD xfce4-session-4.10.1-r2.ebuild 1886 SHA256 975aa9c83c1d575585078eecec495152120ba1513b136bfb9ebcec6098a7734e SHA512 5e2066db09aa21c7c181907a64b1c668d596723c85fc7b2d53d684fcee0ca9ced5817b67598e933ad2f384f6268ced62dbe75996276b1a515fce7872744ce28f WHIRLPOOL 1e6fbfedfd18c831609d7090f4a24a852b2af82fba2af45d2f84fa523566c7c12bb40b2de28c5b7375aa41a33648d8214394770a7f6bc5b92f1b627b30f62931 EBUILD xfce4-session-4.11.0-r2.ebuild 1962 SHA256 827133eacff8d099106a9432690a701cdb04001aef0d1bfafeae1f6c417ca9ca SHA512 2e596ca5964f24e21ec7d61141632d3580b6454b8dbce58f3295129fce4fb55a1f2820bd934864e62408a5ab49c006aecc2a315981218a124303415f5087d3fd WHIRLPOOL bb45ecfc57d16011b16134ef0fa8328a093b97a26629559c0f51de670a0b5fcd1b316fbd450a4ba8926d9d5a14240c5931a52551cdce78faea2125ed5c42b4d9 -EBUILD xfce4-session-4.12.0.ebuild 1953 SHA256 9207bb79956b72f3900bf9e35b5ce699d156601994791eb771a41984e08e8f57 SHA512 98a07b2124606aafa2906cfb478cd2ec46632b32a9b100a1417527d630dcc836965e4b5cff61f0e918142264d01a3bc380a79ff01edb3f90de9942a6faf77ab1 WHIRLPOOL 0e1695a36701e25f906370b92479d53f2577c2d1571f5ae95dad981168f53179c848870ae52ad7e56c72f79a44ce7fa947de23f0aa47240cb904b28b44efc720 -MISC ChangeLog 31461 SHA256 a0ccbc7c4865e11a4096b992a3b37e99a017f9a6f17b49ffd8d6ab1320b706db SHA512 a69063b1f68755cc73050c8113b3ed586d2b28f20514e21b9929a720868fd3fbb20a148c83c13e6cf14f519828daa970e434188a0aff5c33b418aa23cf0b3c2b WHIRLPOOL f85958f05086f48f5b26e320dd94f13043daae21af0ee78e96c4663be2d8af6a5152ce802ed55bdf7ecb06555c58380e98418550b5e93622d1a246f7c63ddaaa +EBUILD xfce4-session-4.12.0-r1.ebuild 2002 SHA256 78d9b89d6b4b3350c23a8d7a4e75e847f254772a301d0a520b5eed7fc925aff1 SHA512 18407c8ef411ff024f4a268b575f908a68f730875a701999892eb2884434cedaeb4f8c5179a4e26144696a4aa6358d6e3d80078bcbe85f88f84ca1d6bdf6ead3 WHIRLPOOL b5e712ab9dbe152fa3cef36a5fe66a44e20087d2cc680828005ad586fbe30be0af466b6908901067eaef38fd69ecf3b5a1434983ecb8d20211653d2bc8ea21c5 +MISC ChangeLog 31728 SHA256 9ef275705af11af782ec67f6fb1f1bcb005303b1399ec0e8ec6dd6ee4e83df2b SHA512 4d6de18ad7c6655c40a4533588592bc2cd0a0b18e74b7db801304fbdc9987e5cc630fd131b4e30ac126b4bfb2b0571bec0090e163b60ce6b0724ae1ec238b001 WHIRLPOOL ec0bdb15187e5df2d4cdb9885af2dbc0c548168dd825c0ab8daa14f59a67a4aa1c77e804cc89daeeb009eff02d251a2cae2c0bd4bf2b4a0b26c2783ca21b7e1f MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJU/GWIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVBdUzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBy8P/j7FuaO9wyyx9aKHGbNoTRtO -nJb7vM1ZYW1FMsFjAVgPAhKb2tUgmLgm1wLMqiyULPBvFL+ciJm+z73OFU2nZ2H6 -MJ7FxcSInG2nY8zxJxo1egXZyqwrdDUDQzCAu974nlcTNIU1XcGJtljFRJiwPTeo -WBahZNSEMwQ3PkvA6ELz6P7rhNZd7PwXP7myYaJsWNNF9bQCwceOlQbn3+HFUT2a -13TiiIfrVkQEnbAglIQmOm4tvHBovXNGmmBz92pRB25gMVP0ZtBz8lAEb2eorUt2 -P4hcHtsqWr93N7BKpWDapvZmmkTq7L+lQFabjQ663EbVGtsCRwGKjugYI0ll8Q55 -C7HtTQiTj3c1GXeoAQJo38RVGSKeJ/Bq1nGr3q1RpIl7zST0i7/PUN+XKZhdlbWd -fZkn6RvqE+NGhriF4gzaG6i+MYNwIReMpwB/JKpPw8uai2KVqPkOUK43f7SlLPEP -XP/JbCsGxMpSjAqkSjWfy8ckTuXVCg0LrtH7rIN6lvVOxLfM4Avv6aJVAIp8vgTU -COESrnQ6SUzizTrk/2y4ncYV/3BwagMrBwGtnpuKdmaeDqgTdgZfbtNHppT4lQx3 -G38oedkRvioLcRtKqge4HpA6rQrp18e9psRNp7TJBrIb59fb8G6cYCEKgRssaRDn -XeoQXQhJ803UXd2VQQWa -=2h5s +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHicQAMzptk7h5rboSI7amDK+jksg +huiw4qICpFKfhynQYOK//+IkP82TaQs3tyd+PLjKWz39uYuZeD4RN8VKUzUqXxjm +B1u1onzT339I+DVWy/c6+5UN4mo5TpFQRt3MAP7R1SMYHWFt1X61xED4SJHsX0+o +dMFRsufRDfnyGJhUfbLyLMGJm3u2AzrxMWIBE3sSD3FyCLVo7xyGXf1xLlyznYp+ +7h6w1LtLubwRAuisZDipP0duhWm4CWUk6Xo79hFIPYjYA1Us7oWKeZ9gM/NTKGXM +hKCeK084IdgyGVpFfWwjzj/IsUWpL0o2i/hcCD9yewN4LBpgmzJRsvjShJ9lH4G5 +w8tWIz+rUo+Sj5CdmpiPNIsqg/6ANVDE4GKBic3fsJzb09k7JXFGf3Lu4wU744Qh ++u8GJaY7s8vdORfZIUoji5YyL0G1Bd9a32ERQBvLO5dninN4VdPtX/wUIFdWMwdR +nsw+XvOsEgOv20oLTWhbQ/i8xWjsddybMBMCC5LTw7Hj4mGvvOP8rEzbMNBlkC15 +pZ44d7dWhQaPUjUY0dQApGM8+DBYZWxMVrALZLfdsUXuIR9hQOGS/FqDXzk7WM5v +C2H95ZfRX0fnKdm6u+CgwwtCc8utfVNtstr25Yo0LSX0d+NmU0JutB8FfMETFRN0 +SRK9TKxbJPJML+8dBrd8 +=Imb7 -----END PGP SIGNATURE----- diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild new file mode 100644 index 000000000000..ac73be2e61c2 --- /dev/null +++ b/xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.12.0-r1.ebuild,v 1.1 2015/03/15 18:53:38 mgorny Exp $ + +EAPI=5 +EAUTORECONF=1 +inherit xfconf + +DESCRIPTION="A session manager for the Xfce desktop environment" +HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start" +SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug nls policykit systemd upower +xscreensaver" + +COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:= + x11-apps/iceauth + x11-libs/libSM:= + >=x11-libs/libwnck-2.30:1= + x11-libs/libX11:= + >=xfce-base/libxfce4util-4.11:= + >=xfce-base/libxfce4ui-4.11:= + >=xfce-base/xfconf-4.10:= + !xfce-base/xfce-utils + !=xfce-base/libxfce4ui-4.12.0 + policykit? ( >=sys-auth/polkit-0.102:= ) + upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )" +RDEPEND="${COMMON_DEPEND} + x11-apps/xrdb + nls? ( x11-misc/xdg-user-dirs ) + !systemd? ( upower? ( sys-power/pm-utils ) ) + xscreensaver? ( || ( + >=x11-misc/xscreensaver-5.26 + gnome-extra/gnome-screensaver + >=x11-misc/xlockmore-5.43 + x11-misc/slock + x11-misc/alock[pam] + ) )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="systemd? ( policykit )" + +pkg_setup() { + PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch ) + + XFCONF=( + --docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable policykit polkit) + --with-xsession-prefix="${EPREFIX}"/usr + $(xfconf_use_debug) + ) + + use upower && XFCONF+=( --enable-upower ) + + DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO ) +} + +src_install() { + xfconf_src_install + + local sessiondir=/etc/X11/Sessions + echo startxfce4 > "${T}"/Xfce4 + exeinto ${sessiondir} + doexe "${T}"/Xfce4 + dosym Xfce4 ${sessiondir}/Xfce +} diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild deleted file mode 100644 index 9b416ad1eda2..000000000000 --- a/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild,v 1.1 2015/03/08 15:06:39 mgorny Exp $ - -EAPI=5 -EAUTORECONF=1 -inherit xfconf - -DESCRIPTION="A session manager for the Xfce desktop environment" -HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start" -SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug nls policykit systemd upower +xscreensaver" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 - x11-apps/iceauth - x11-libs/libSM - >=x11-libs/libwnck-2.30:1 - x11-libs/libX11 - >=xfce-base/libxfce4util-4.11 - >=xfce-base/libxfce4ui-4.11 - >=xfce-base/xfconf-4.10 - !xfce-base/xfce-utils - policykit? ( >=sys-auth/polkit-0.102 ) - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )" -RDEPEND="${COMMON_DEPEND} - x11-apps/xrdb - nls? ( x11-misc/xdg-user-dirs ) - !systemd? ( upower? ( sys-power/pm-utils ) ) - xscreensaver? ( || ( - >=x11-misc/xscreensaver-5.26 - gnome-extra/gnome-screensaver - >=x11-misc/xlockmore-5.43 - x11-misc/slock - x11-misc/alock[pam] - ) )" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="systemd? ( policykit )" - -pkg_setup() { - PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch ) - - XFCONF=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable policykit polkit) - --with-xsession-prefix="${EPREFIX}"/usr - $(xfconf_use_debug) - ) - - use upower && XFCONF+=( --enable-upower ) - - DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO ) -} - -src_install() { - xfconf_src_install - - local sessiondir=/etc/X11/Sessions - echo startxfce4 > "${T}"/Xfce4 - exeinto ${sessiondir} - doexe "${T}"/Xfce4 - dosym Xfce4 ${sessiondir}/Xfce -} -- cgit v1.2.3-65-gdbad