Cleanup

(Portage version: 2.1.2.9)

11 files changed, 10 insertions, 285 deletions

diff --git a/sys-apps/suspend2-userui/ChangeLog b/sys-apps/suspend2-userui/ChangeLog
index f5d19949dae0..3d9709083ecc 100644
--- a/sys-apps/suspend2-userui/ChangeLog
+++ b/sys-apps/suspend2-userui/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/suspend2-userui
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.30 2007/06/12 16:23:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.31 2007/06/12 17:19:58 alonbl Exp $
+
+  12 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/suspend2-userui-0.6.4-glibc.patch,
+  -files/suspend2-userui-0.6.4-remove-debug.patch,
+  -files/suspend2-userui-0.6.4-syscall.patch,
+  -files/suspend2-userui-0.7.0-syscall.patch,
+  -suspend2-userui-0.6.4-r1.ebuild, -suspend2-userui-0.6.4-r2.ebuild,
+  -suspend2-userui-0.7.0.ebuild:
+  Cleanup
 
   12 Jun 2007; Markus Ullmann <jokey@gentoo.org>
   suspend2-userui-0.7.1.ebuild:
diff --git a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r1 b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r1
deleted file mode 100644
index b69cd4626edc..000000000000
--- a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 737427dd2eb076907674a4334735c2ef suspend2-userui-0.6.4.tar.gz 91817
-RMD160 1f00e32ae28d0d19666db106dc2f64ff9ce99de5 suspend2-userui-0.6.4.tar.gz 91817
-SHA256 5b9b74832073df26d74158306ce673d1765246a2b630a8b68cd8ef21cb79b076 suspend2-userui-0.6.4.tar.gz 91817
diff --git a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r2 b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r2
deleted file mode 100644
index b69cd4626edc..000000000000
--- a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 737427dd2eb076907674a4334735c2ef suspend2-userui-0.6.4.tar.gz 91817
-RMD160 1f00e32ae28d0d19666db106dc2f64ff9ce99de5 suspend2-userui-0.6.4.tar.gz 91817
-SHA256 5b9b74832073df26d74158306ce673d1765246a2b630a8b68cd8ef21cb79b076 suspend2-userui-0.6.4.tar.gz 91817
diff --git a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.7.0 b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.7.0
deleted file mode 100644
index 2adf3c3a5a5b..000000000000
--- a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.7.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7a41e9195597319825ecee0d1f3aa166 suspend2-userui-0.7.0.tar.gz 91961
-RMD160 fe85fa434273b4a08d6d42d23d1bdab283ba3428 suspend2-userui-0.7.0.tar.gz 91961
-SHA256 a8cc5ed9b5916996e948026ebe3864e31bf62539d3bee79b3637d376be1fa7ca suspend2-userui-0.7.0.tar.gz 91961
diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-glibc.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-glibc.patch
deleted file mode 100644
index fa634371c317..000000000000
--- a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-glibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- suspend2-userui-0.6.4/userui.h.orig	2007-01-05 10:43:40.000000000 -0500
-+++ suspend2-userui-0.6.4/userui.h	2007-01-05 10:44:11.000000000 -0500
-@@ -124,8 +124,11 @@ static __inline__ int generic_fls(int x)
- /*
-  * Work around random glibc bugs where getpid() caches an invalid pid.
-  */
-+#ifdef _syscall0
- #define __NR_xgetpid __NR_getpid
- static inline _syscall0(pid_t, xgetpid);
--
-+#else
-+static inline pid_t xgetpid(void) { return syscall(__NR_getpid); }
-+#endif
- 
- #endif /* _USERUI_H_ */
diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-remove-debug.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-remove-debug.patch
deleted file mode 100644
index ad5b76146d23..000000000000
--- a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-remove-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Common subdirectories: suspend2-userui-0.6.4/fbsplash and suspend2-userui-0.6.4-remove-debug/fbsplash
-diff -u suspend2-userui-0.6.4/userui_core.c suspend2-userui-0.6.4-remove-debug/userui_core.c
---- suspend2-userui-0.6.4/userui_core.c	2006-06-06 19:25:12.000000000 +0200
-+++ suspend2-userui-0.6.4-remove-debug/userui_core.c	2006-06-06 20:07:33.000000000 +0200
-@@ -875,7 +875,6 @@
- 	enforce_lifesavers();
- 
- 	if (test_run) {
--	test_run = 0;
- 	safe_to_exit = 0;
- 
- 		do_test_run();
-Common subdirectories: suspend2-userui-0.6.4/usplash and suspend2-userui-0.6.4-remove-debug/usplash
diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-syscall.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-syscall.patch
deleted file mode 100644
index 56593df648b4..000000000000
--- a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-syscall.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru suspend2-userui-0.6.4/userui.h suspend2-userui-0.6.4-new/userui.h
---- suspend2-userui-0.6.4/userui.h	2006-06-07 03:25:12.000000000 +1000
-+++ suspend2-userui-0.6.4-new/userui.h	2006-10-14 01:57:51.000000000 +1000
-@@ -1,7 +1,7 @@
- #ifndef _USERUI_H_
- #define _USERUI_H_
- 
--#include <linux/unistd.h>
-+#include <sys/syscall.h>
- #include <sys/types.h>
- #include "suspend_userui.h"
- 
-@@ -124,8 +124,7 @@
- /*
-  * Work around random glibc bugs where getpid() caches an invalid pid.
-  */
--#define __NR_xgetpid __NR_getpid
--static inline _syscall0(pid_t, xgetpid);
-+#define xgetpid() syscall(SYS_getpid)
- 
- 
- #endif /* _USERUI_H_ */
-
diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch
deleted file mode 100644
index 9ea0c849b3b1..000000000000
--- a/sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urNp suspend2-userui-0.7.0.org/userui.h suspend2-userui-0.7.0/userui.h
---- suspend2-userui-0.7.0.org/userui.h	2007-01-17 00:16:46.000000000 +0200
-+++ suspend2-userui-0.7.0/userui.h	2007-02-11 12:21:22.000000000 +0200
-@@ -1,7 +1,7 @@
- #ifndef _USERUI_H_
- #define _USERUI_H_
- 
--#include <linux/unistd.h>
-+#include <sys/syscall.h>
- #include <sys/types.h>
- #include "suspend_userui.h"
- 
-@@ -124,11 +124,6 @@ static __inline__ int generic_fls(int x)
- /*
-  * Work around random glibc bugs where getpid() caches an invalid pid.
-  */
--#ifdef _syscall0
--#define __NR_xgetpid __NR_getpid
--static inline _syscall0(pid_t, xgetpid);
--#else
--static inline pid_t xgetpid(void) { return syscall(__NR_getpid); }
--#endif
-+#define xgetpid() syscall(SYS_getpid)
- 
- #endif /* _USERUI_H_ */
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild
deleted file mode 100644
index 2c8dd1a3c700..000000000000
--- a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild,v 1.4 2007/04/26 05:41:10 alonbl Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="User Interface for Software Suspend 2"
-HOMEPAGE="http://www.suspend2.net"
-SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE="fbsplash static"
-DEPEND="virtual/libc
-		fbsplash? (	sys-libs/zlib
-					media-libs/freetype
-					media-libs/jpeg
-					media-libs/lcms
-					>=media-libs/libmng-1.0.5
-					media-libs/libpng )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-remove-debug.patch"
-	epatch "${FILESDIR}/${P}-glibc.patch"
-}
-
-src_compile() {
-	# allow for static linking for use in initramfs/initrd
-	use static && LDFLAGS="${LDFLAGS} -static"
-
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		suspend2ui_text || die "emake suspend2ui_text failed"
-
-	if use fbsplash; then
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-			fbsplash || die "emake fbsplash failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-			suspend2ui_fbsplash || die "emake suspend2ui_fbsplash failed"
-	fi
-}
-
-src_install() {
-	into /
-	dosbin suspend2ui_text
-	use fbsplash && dosbin suspend2ui_fbsplash
-
-	dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
-}
-
-pkg_postinst() {
-	if use fbsplash; then
-		einfo
-		einfo "You must create a symlink from /etc/splash/suspend2"
-		einfo "to the theme you want suspend2ui_fbsplash to use, e.g.:"
-		einfo
-		einfo "  # ln -sfn /etc/splash/emergence /etc/splash/suspend2"
-	fi
-
-	einfo
-	einfo "Please see /usr/share/doc/${PF}/README.* for further"
-	einfo "instructions."
-	einfo
-}
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild
deleted file mode 100644
index 5527ad484a1b..000000000000
--- a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild,v 1.2 2007/04/26 05:41:10 alonbl Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="User Interface for Software Suspend 2"
-HOMEPAGE="http://www.suspend2.net"
-SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="fbsplash static"
-DEPEND="virtual/libc
-		fbsplash? (	sys-libs/zlib
-					media-libs/freetype
-					media-libs/jpeg
-					media-libs/lcms
-					>=media-libs/libmng-1.0.5
-					media-libs/libpng )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-remove-debug.patch"
-	epatch "${FILESDIR}/${P}-syscall.patch"
-}
-
-src_compile() {
-	# allow for static linking for use in initramfs/initrd
-	use static && LDFLAGS="${LDFLAGS} -static"
-
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		suspend2ui_text || die "emake suspend2ui_text failed"
-
-	if use fbsplash; then
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-			fbsplash || die "emake fbsplash failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-			suspend2ui_fbsplash || die "emake suspend2ui_fbsplash failed"
-	fi
-}
-
-src_install() {
-	into /
-	dosbin suspend2ui_text
-	use fbsplash && dosbin suspend2ui_fbsplash
-
-	dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
-}
-
-pkg_postinst() {
-	if use fbsplash; then
-		einfo
-		einfo "You must create a symlink from /etc/splash/suspend2"
-		einfo "to the theme you want suspend2ui_fbsplash to use, e.g.:"
-		einfo
-		einfo "  # ln -sfn /etc/splash/emergence /etc/splash/suspend2"
-	fi
-
-	einfo
-	einfo "Please see /usr/share/doc/${PF}/README.* for further"
-	einfo "instructions."
-	einfo
-}
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild
deleted file mode 100644
index d39230097ec3..000000000000
--- a/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild,v 1.4 2007/04/26 05:41:10 alonbl Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="User Interface for Software Suspend 2"
-HOMEPAGE="http://www.suspend2.net"
-SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="fbsplash"
-DEPEND="virtual/libc
-		fbsplash? (	sys-libs/zlib
-					media-libs/freetype
-					media-libs/jpeg
-					media-libs/lcms
-					>=media-libs/libmng-1.0.5
-					media-libs/libpng )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-syscall.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		suspend2ui_text || die "emake suspend2ui_text failed"
-
-	if use fbsplash; then
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-			fbsplash || die "emake fbsplash failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-			suspend2ui_fbsplash || die "emake suspend2ui_fbsplash failed"
-	fi
-}
-
-src_install() {
-	into /
-	dosbin suspend2ui_text
-	use fbsplash && dosbin suspend2ui_fbsplash
-
-	dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
-}
-
-pkg_postinst() {
-	if use fbsplash; then
-		einfo
-		einfo "You must create a symlink from /etc/splash/suspend2"
-		einfo "to the theme you want suspend2ui_fbsplash to use, e.g.:"
-		einfo
-		einfo "  # ln -sfn /etc/splash/emergence /etc/splash/suspend2"
-	fi
-
-	einfo
-	einfo "Please see /usr/share/doc/${PF}/README.* for further"
-	einfo "instructions."
-	einfo
-}