diff options
5 files changed, 25 insertions, 209 deletions
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index e3a6f8731b0b..dc5bb0591070 100644 --- a/gnome-extra/gnome-screensaver/ChangeLog +++ b/gnome-extra/gnome-screensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gnome-screensaver # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.151 2012/03/14 07:00:23 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.152 2012/04/01 17:44:54 pacho Exp $ + + 01 Apr 2012; Pacho Ramos <pacho@gentoo.org> -gnome-screensaver-2.30.2.ebuild, + -gnome-screensaver-3.2.1.ebuild, gnome-screensaver-2.30.2-r1.ebuild: + Run gnome2_src_prepare at proper place (#405259 by Szymluk), remove old. *gnome-screensaver-3.2.2 (14 Mar 2012) diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest index 836f44497039..7046aeada439 100644 --- a/gnome-extra/gnome-screensaver/Manifest +++ b/gnome-extra/gnome-screensaver/Manifest @@ -1,5 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 + +- -----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 AUX gentoologo-floaters.desktop 414 RMD160 5a34dd8a7b083c1d94e4298c4644d23c7b7f5130 SHA1 a7a38434fd010a1b34d9f9951576752e9691a2b5 SHA256 d8ae7a179c24167d70bb7712eda48807f10b09bce0f32b7f521af21654b641f9 AUX gnome-screensaver-2.30.2-libnotify-0.7.patch 708 RMD160 be33bce94e652cecc5e11ec7d25205e9b8e2ffbf SHA1 c0d1e45306d3dc81266dd4c8269920258b79e3e0 SHA256 09bd31d89527e489b0b21e5cd4f432522205b573db57729a86046d7e85e53656 @@ -12,18 +15,22 @@ AUX gnome-screensaver-2.30.2-prevent-twice.patch 2300 RMD160 d06e4753af978a8c343 AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8 DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e DIST gnome-screensaver-2.30.2.tar.bz2 4814653 RMD160 1b13722f3bebca709b9f44c45e995d07ed6c2044 SHA1 f9d7c0df0efaa6916099ca56078da8b36f4c4935 SHA256 dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa -DIST gnome-screensaver-3.2.1.tar.xz 563292 RMD160 dd87cf7accf048897b23cdcbd0122d0c8c6f5eb6 SHA1 247031a20ec7010d7c9116eff6bf26b6e2fe9643 SHA256 a5beea3e854c27369eb10a2987ab6673101416f56f1c616075cefae2458f5411 DIST gnome-screensaver-3.2.2.tar.xz 564728 RMD160 a67917aeb7f016ea43f7db50712a509dae761680 SHA1 3b6ef3845a2e237bb36ba8b4080410de7fbadb79 SHA256 7839ca0e034c4ecf40c8abe64296c4b0c95f3e04f28e3034fca861ebfe3d06b2 -EBUILD gnome-screensaver-2.30.2-r1.ebuild 4419 RMD160 7a808f98285d432aab48c17adbea4604412c304d SHA1 4b7045207efce90d964751faf1a8bb18acf8a8ec SHA256 27f57d97eadf3fdb0f326a28017913e1bcc119ed3660e6dc35b39c074f94e8fa -EBUILD gnome-screensaver-2.30.2.ebuild 3703 RMD160 458e08f9c956a4ac554c2bd496fa50453398cde9 SHA1 0c63eb73422941591d0b8b1cabcadbe9b1ce777d SHA256 4197dd7d4cef23d21835ca1a9a6288071907ff18ac202f2068411585103ca020 -EBUILD gnome-screensaver-3.2.1.ebuild 1859 RMD160 cb86c9383ca61e932111e59f348dd56e94a5ff4a SHA1 7c945643eceb3f6fd7cb839c072d0b43eccbd0b2 SHA256 45a139b71ac7dc288cbae4f844635b58580cf93ee01d5fcef5cafbda552213d2 +EBUILD gnome-screensaver-2.30.2-r1.ebuild 4414 RMD160 0c785944450cf3a0732621f74a4463aab3226e12 SHA1 84137821965835a44c77f78288ddf7ca34812076 SHA256 8ddc410bcd34da3197c5a03924b7ff28520a93eca4d7feeb7fafb9d9f8df32a0 EBUILD gnome-screensaver-3.2.2.ebuild 1859 RMD160 21e10821da8bef6ed240dda81340d284d0669fb0 SHA1 21c411b254c929341bafd3c38ad4e62723bc494a SHA256 82e54367aae51cdb4e0fd24904a0153313b5a96dc6caabf32fade3c098f21940 -MISC ChangeLog 25267 RMD160 5c1d64ab1dccf8cd9bc3f6e706cc162d2b4c6457 SHA1 e9a379e61db8cd4e9c144a1ad2295471c498a6f2 SHA256 63829345e729fcb9b932a55591d135febdcf8de6e5ef0001674fc75e01ea2f31 +MISC ChangeLog 25490 RMD160 8b19a56ab422befcb8ad88b8fabc52ecf99beb4d SHA1 01b42afce1c4630bd7042b4df3c120f2b37b2ff8 SHA256 37a70b8d15bdcc06871d76baa23ebe2c2fd73b2de054df09cb9bd5799684dc08 MISC metadata.xml 461 RMD160 26acd2d40086e52b62430cd767e38fca2c9f7c57 SHA1 08de907e73544b74a4412c44739ebc695829ae6d SHA256 1f9263f2c172b8e33b62054a80f8809f3ce31fd9f648a4d326315b98f14dcc5b +- -----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk94lBwACgkQCaWpQKGI+9T6UgCcD+zzPTcXss0jZOywCz7uHbGg +CwMAnAiqWbIiAw9BGasESYz+hGrmNypy +=0Z5w +- -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9gQgwACgkQdjK8w9WeBnAx+AD+Oh0ju3c8dYE6inKd5jBuNM6v -QqMg33RpRM9mdGoUcZAA/iAnwwwBk6mQf6hCrDSZffksQPehxYmPWGIzyrcT4eAZ -=Z2QV +iEYEARECAAYFAk94lIsACgkQCaWpQKGI+9R7ggCfUoGQrTHZeq+DX18yTce8V3ed +xDwAn0eklL7wQdJ6jxrKPfV3w7WRnRQ1 +=iJUe -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild index b304d13ae8dd..2bbf480cebbd 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild,v 1.8 2011/11/28 18:38:09 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild,v 1.9 2012/04/01 17:44:54 pacho Exp $ EAPI="2" @@ -64,8 +64,6 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare - # libnotify support was removed from trunk, so not needed for next release epatch "${FILESDIR}/${P}-libnotify-0.7.patch" @@ -91,6 +89,7 @@ src_prepare() { intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf + gnome2_src_prepare } src_install() { diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild deleted file mode 100644 index 58cb4c19e078..000000000000 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2.ebuild,v 1.10 2011/11/28 18:38:09 tetromino Exp $ - -EAPI="2" - -inherit eutils gnome2 multilib - -DESCRIPTION="Replaces xscreensaver, integrating with the desktop." -HOMEPAGE="http://live.gnome.org/GnomeScreensaver" -SRC_URI="${SRC_URI} - branding? ( http://www.gentoo.org/images/gentoo-logo.svg )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -KERNEL_IUSE="kernel_linux" -IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE" - -RDEPEND=">=gnome-base/gconf-2.6.1:2 - >=x11-libs/gtk+-2.14.0:2 - >=gnome-base/gnome-desktop-2.29.0:2 - >=gnome-base/gnome-menus-2.12:0 - >=dev-libs/glib-2.15:2 - >=gnome-base/libgnomekbd-0.1 - >=dev-libs/dbus-glib-0.71 - libnotify? ( x11-libs/libnotify ) - opengl? ( virtual/opengl ) - pam? ( virtual/pam ) - !pam? ( kernel_linux? ( sys-apps/shadow ) ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-libs/libXxf86misc - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40 - doc? ( - app-text/xmlto - ~app-text/docbook-xml-dtd-4.1.2 - ~app-text/docbook-xml-dtd-4.4 ) - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto" - -DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable doc docbook-docs) - $(use_enable debug) - $(use_with libnotify) - $(use_with opengl gl) - $(use_enable pam) - --enable-locking - --with-xf86gamma-ext - --with-kbd-layout-indicator - --with-xscreensaverdir=/usr/share/xscreensaver/config - --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver" -} - -src_prepare() { - # libnotify support was removed from trunk, so not needed for next release - epatch "${FILESDIR}/${P}-libnotify-0.7.patch" - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed failed" - - gnome2_src_prepare -} - -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" - - # Conversion information - sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \ - > "${S}/xss-conversion.txt" || die "sed failed" - - dodoc "${S}/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/gnome-screensaver-dialog - fi - - if use branding ; then - insinto /usr/share/pixmaps/ - doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed" - insinto /usr/share/applications/screensavers/ - doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed" - fi -} - -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 "gnome-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 - - elog "Information for converting screensavers is located in " - elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}" -} diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild deleted file mode 100644 index e2d414f63b09..000000000000 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.1.ebuild,v 1.2 2012/02/14 04:24:33 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="yes" - -inherit gnome2 - -DESCRIPTION="Replaces xscreensaver, integrating with the desktop." -HOMEPAGE="http://live.gnome.org/GnomeScreensaver" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug doc pam systemd" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -RDEPEND=" - >=dev-libs/glib-2.25.6:2 - >=x11-libs/gtk+-2.99.3:3 - >=gnome-base/gnome-desktop-3.1.91:3 - >=gnome-base/gsettings-desktop-schemas-0.1.7 - >=gnome-base/libgnomekbd-0.1 - >=dev-libs/dbus-glib-0.71 - - sys-apps/dbus - x11-libs/libxklavier - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-libs/libXxf86misc - x11-libs/libXxf86vm - x11-themes/gnome-icon-theme-symbolic - - pam? ( virtual/pam ) - systemd? ( >=sys-apps/systemd-31 ) -" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35 - sys-devel/gettext - doc? ( - app-text/xmlto - ~app-text/docbook-xml-dtd-4.1.2 - ~app-text/docbook-xml-dtd-4.4 ) - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto -" - -pkg_setup() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - G2CONF="${G2CONF} - $(use_enable doc docbook-docs) - $(use_enable pam locking) - $(use_with systemd) - --with-mit-ext - --with-pam-prefix=/etc - --with-xf86gamma-ext - --with-kbd-layout-indicator - --disable-schemas-compile" - # Do not use --without-console-kit, it would provide no benefit: there is - # no build-time or run-time check for consolekit, $PN merely listens to - # consolekit's messages over dbus. - # xscreensaver and custom screensaver capability removed - # poke and inhibit commands were also removed, bug 579430 -} |