Add prefix support, patch, and keywords

Package-Manager: portage-2.2.0_alpha23_p5/cvs/Linux i686

4 files changed, 72 insertions, 14 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7820e3764b2c..3dfbac1d93be 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.284 2011/01/21 14:54:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.285 2011/03/15 23:22:25 abcd Exp $
+
+  15 Mar 2011; Jonathan Callen <abcd@gentoo.org>
+  +files/xscreensaver-5.05-interix.patch, xscreensaver-5.12-r1.ebuild:
+  Add prefix support, patch, and keywords
 
   21 Jan 2011; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.12.ebuild:
   Stable for HPPA (bug #349029).
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 8c8da47f484a..8602c3f34a51 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xscreensaver-5.05-interix.patch 1033 RMD160 8246ead601e80f89e535ffad6b6d3298c7f96eab SHA1 b3e5168c1cb204032c5af4a7631dc08222b0eee5 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27
 AUX xscreensaver-5.10-gentoo.patch 3673 RMD160 3b70efb6ae6b4e69471e35ed4674524e8dc4a7c1 SHA1 6e35e2c874c52c08e6ec0962ed964753089e9821 SHA256 ca0f244d52e7c61e1776480ff390a152acac1f5b4b0d8018a8d12f773e233ab3
 AUX xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch 485 RMD160 96622fa4aa95bd13afe4b9dbc9b998319524c972 SHA1 85d8f5e07d08c1080e605a7cdcf9aa89ff7752fd SHA256 6bee564aa12e7533f54f52834681eea12cbee387f3875f114a7751e83e065128
 AUX xscreensaver-5.12-gltext-memleak.patch 219 RMD160 1ab5299f8b6f19fe86714d846b24b810c133f2e4 SHA1 2108fd66fbbb45cb57b31762dd3a13a99d99b579 SHA256 d59c517376c38b09bcda18eea1d61d4dfcbf8d8d6885043447a571594ed516e4
 DIST xscreensaver-5.12.tar.gz 5606851 RMD160 c0fbd8cfad2919b06c8479bcebfa9af81aa97ae6 SHA1 7252540b1b1853459a56453714c0974de26fa4c5 SHA256 b11da52775c895e29c312a4472187afdecffc809ef691c7ae603475072efdbce
-EBUILD xscreensaver-5.12-r1.ebuild 2584 RMD160 11b260219cd58d211a833b3eb504b135101642e1 SHA1 68f063c1dc7bbc2c49d55f38fb2579a0f9d09fa5 SHA256 c2bda7cd709f97c3a9f0bf74058838152aeb546763bdb7485b2bfcb1e50d0899
+EBUILD xscreensaver-5.12-r1.ebuild 2771 RMD160 4422b55cdb57f845ca285ed6df121ca463edd820 SHA1 4bcfef7e18d6b4d82012f971000bc6705499e58c SHA256 3917c7fabf6fb0337e85e60f24b5552e1d27d90ad1f91f132a194885497d9234
 EBUILD xscreensaver-5.12.ebuild 2534 RMD160 0b15b7c781e429f5b4ca01d0fafa0927e3ec7522 SHA1 3b0a6c916997c9abf873617c00bb0f1ddd597c8c SHA256 ab7c83ae4a14fc1560170b1ae6708a651db558afa1ec77a8990c827449dfe1c2
-MISC ChangeLog 45940 RMD160 99127d2da6f9bc34a49811126547ee2c7c3ac783 SHA1 08eb264be467c4664b0b276670bd2a1f2ac5cc42 SHA256 aeef854f586707d6bacac9caac0ccae014921f61dcbbad72790c9e3a6172b3c2
+MISC ChangeLog 46104 RMD160 5fc4898a742bc03b6846041b1138690a89ab82b3 SHA1 5ca4561894ea9de3d1cffc5dd364883ce499b27a SHA256 31941cd1f5223c2eddbe9b077385ea5194f584591c4822aa744634a66debc3bc
 MISC metadata.xml 494 RMD160 ba20404c67b1049332bae94a7a3543d33fb0579f SHA1 431f3a7cacea2e341fed0ef301f70941c9e5adb4 SHA256 b49839244c1c8d9df0ede500471c7d7e9037a8d62150c97ced979e50e68f8a10
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNf/S8AAoJELHSF2kinlg4uDUP/1nGx17BWY+oKzhHbiPBPJ1O
+8QYnb1X8eYzb39o42VFJ8RfGcJw94usLwgcz+rW7afUs1U/DMZtUPNEIhS89L5Fw
+yjdrq7zoYjayhBeQbDW80mWhZmdO3DpIr7ICe9Mqkk2IYfdVUMGAozaFr5Pj9cWi
+TJxsIirvuxie/z+YUJ7s07mOSxIodo7a0awjCQU9VFd3wTK5A++ktAWSIz7qBfLt
+ZqPp7RmNgyQNm+vESMCuOpa9sZTQrMcenrOgZDSZpvuPnKpTdTXfzD0CdxIOp4Ea
+HG0bXjlp2vwPUGWVXlthrexLyl5l1TYeo+CzZuBqjCHtuCWASYgwQzlxhX7xvvoq
+0CYiZfdR3j1MVapZlwO2A4bcDn0Qlr5E5HhyYn4POFwZExmFJt2v434aC8RVH/vO
+6qsxwzUGakhAgGQOF0E5gFsWbr4CvLusn8vkJ7aH8Hlrxq30hJUV7KQMAl8F7FlN
+hlLD/0iEEr0XWpwmeICn/VbyCrGkecZL6cmD9N/oWFyEnQ3l2mdRVBpllwDp52hh
+fkN3O/0RM4GsTvnzFZV0Xhr4MMiDGGjWXYjsoyolklgk57nja9QdqZKgaZ6b5axG
+1NtJKFZ6WikRdtT72XM9FMd/a0xwOd95dG7sK0lsRhZZncghMZmCLCLgGePmhKFW
+3OXWMmAISKvR8gGZkD9x
+=oU44
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
new file mode 100644
index 000000000000..2a5eead4879f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
@@ -0,0 +1,32 @@
+diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
+--- xscreensaver-5.05.orig/driver/prefs.c	2006-05-24 00:03:47 +0200
++++ xscreensaver-5.05/driver/prefs.c	2008-03-11 09:20:58 +0100
+@@ -951,9 +951,12 @@
+ 	{
+ 	  p->init_file_date = write_date;
+ 
++/* Interix has no sync() or alike. */
++#ifndef __INTERIX
+ 	  /* Since the .xscreensaver file is used for IPC, let's try and make
+ 	     sure that the bits actually land on the disk right away. */
+ 	  sync ();
++#endif
+ 
+           status = 0;    /* wrote and renamed successfully! */
+ 	}
+diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c
+--- xscreensaver-5.05.orig/driver/setuid.c	2006-02-09 03:33:29 +0100
++++ xscreensaver-5.05/driver/setuid.c	2008-03-11 09:22:59 +0100
+@@ -136,9 +136,12 @@
+   if (uid == (uid_t) -1) uid = (uid_t) -2;
+ 
+   errno = 0;
++
++#ifndef __INTERIX
+   if (setgroups_needed_p (gid) &&
+       setgroups (1, &gid) < 0)
+     sgs_errno = errno ? errno : -1;
++#endif
+ 
+   errno = 0;
+   if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild
index 57c0ca41b469..9b9ddcda9a3e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild,v 1.1 2011/01/13 11:34:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild,v 1.2 2011/03/15 23:22:25 abcd Exp $
 
-EAPI=2
+EAPI=3
 inherit autotools eutils flag-o-matic multilib pam
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="jpeg new-login opengl pam suid xinerama"
 
 RDEPEND="x11-libs/libXmu
@@ -49,7 +49,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.10-gentoo.patch \
-		"${FILESDIR}"/${P}-*.patch
+		"${FILESDIR}"/${P}-*.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch
 	eautoconf
 }
 
@@ -64,12 +65,12 @@ src_configure() {
 	unset BC_ENV_ARGS #24568
 
 	econf \
-		--x-includes=/usr/include \
-		--x-libraries=/usr/$(get_libdir) \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
 		--enable-locking \
-		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
-		--with-configdir=/usr/share/${PN}/config \
-		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
 		--with-dpms-ext \
 		$(use_with xinerama xinerama-ext) \
 		--with-xinput-ext \
@@ -87,7 +88,7 @@ src_configure() {
 		$(use_with jpeg) \
 		--with-xshm-ext \
 		--with-xdbe-ext \
-		--with-text-file=/etc/gentoo-release \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
 		$(use_with suid setuid-hacks)
 }
 
@@ -98,5 +99,5 @@ src_install() {
 	use pam && fperms 755 /usr/bin/${PN}
 	pamd_mimic_system ${PN} auth
 
-	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
 }