Cleanup

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

7 files changed, 4 insertions, 238 deletions

diff --git a/sys-apps/suspend2-userui/Manifest b/sys-apps/suspend2-userui/Manifest
index 0b6ec4a0a2ce..6eff21dfb654 100644
--- a/sys-apps/suspend2-userui/Manifest
+++ b/sys-apps/suspend2-userui/Manifest
@@ -1,14 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX suspend2-userui-0.6.3-skewed-image.patch 1551 RMD160 e28e0b0b5072d6477e79f1f3116607de830fa8c9 SHA1 64d5ace21dd22bbcac5e0e9dfbc31f7775a3be20 SHA256 0f74c62af276072743d0b42de5b1adeddb6d8effdf21d144acd539485e7e28b1
-MD5 7ebbb292a7fc3672467e7f2fd7255c70 files/suspend2-userui-0.6.3-skewed-image.patch 1551
-RMD160 e28e0b0b5072d6477e79f1f3116607de830fa8c9 files/suspend2-userui-0.6.3-skewed-image.patch 1551
-SHA256 0f74c62af276072743d0b42de5b1adeddb6d8effdf21d144acd539485e7e28b1 files/suspend2-userui-0.6.3-skewed-image.patch 1551
-AUX suspend2-userui-0.6.3-skewed-text.patch 416 RMD160 09daa415e2e09958f5e4c8e6a7c9940732042e72 SHA1 a42f44a740f58fb9dbfac4d987557a17ffcca07c SHA256 a62cf316af1e9cc93afe3a50e627bbd56c4b06a8d7d56896835a5aa5db0dd427
-MD5 ad0e358f60075a903529f7e8d4b64d3f files/suspend2-userui-0.6.3-skewed-text.patch 416
-RMD160 09daa415e2e09958f5e4c8e6a7c9940732042e72 files/suspend2-userui-0.6.3-skewed-text.patch 416
-SHA256 a62cf316af1e9cc93afe3a50e627bbd56c4b06a8d7d56896835a5aa5db0dd427 files/suspend2-userui-0.6.3-skewed-text.patch 416
 AUX suspend2-userui-0.6.4-glibc.patch 496 RMD160 ce164e74fc2cd6b30ff4086b82eef870f0d4e47f SHA1 accc29396a93c87ebdcf0e04c2c56fdb1a366e0b SHA256 0fbe276f9d740ce65ff3f7458047cd02d0cf9f560c35332f6a3774ebde2c09db
 MD5 2c130ab6830433fc1ff9481a6f568dc5 files/suspend2-userui-0.6.4-glibc.patch 496
 RMD160 ce164e74fc2cd6b30ff4086b82eef870f0d4e47f files/suspend2-userui-0.6.4-glibc.patch 496
@@ -17,41 +6,19 @@ AUX suspend2-userui-0.6.4-remove-debug.patch 580 RMD160 696462ca16cee491dc0dee1a
 MD5 914b309d095d1ba985ebb419a5fcabf8 files/suspend2-userui-0.6.4-remove-debug.patch 580
 RMD160 696462ca16cee491dc0dee1ae581b8c5a0d3b72f files/suspend2-userui-0.6.4-remove-debug.patch 580
 SHA256 e0ddd798c53ff576fc5e3431cdf0b6c91686f5ede81388abca178ee64e4ed0a4 files/suspend2-userui-0.6.4-remove-debug.patch 580
-DIST suspend2-userui-0.6.3.tar.gz 388915 RMD160 2a04eff1ff471770a1472d9e4f7075f5f4342acc SHA1 a58644e64ee9f0ded9a996fc548a33679b55b9f5 SHA256 08a98b3fc8388fb06b63d6367ddb5107efc9663ac6a7866f696a17935ecd4cb4
 DIST suspend2-userui-0.6.4.tar.gz 91817 RMD160 1f00e32ae28d0d19666db106dc2f64ff9ce99de5 SHA1 9bcfa2575ee10bde27f9d14d83ae1fb9a1143d01 SHA256 5b9b74832073df26d74158306ce673d1765246a2b630a8b68cd8ef21cb79b076
-EBUILD suspend2-userui-0.6.3-r1.ebuild 1642 RMD160 d2a8d53148d5b7714506d1f77646dd2032f6e165 SHA1 4796368e92c132f1a279a7a5c1c10beb8dc67928 SHA256 21204fdb947050d545c0d22133bbef73f9118793ecf973ffc9b02901041693fc
-MD5 5f15373b602355b6db9a66247405c4f0 suspend2-userui-0.6.3-r1.ebuild 1642
-RMD160 d2a8d53148d5b7714506d1f77646dd2032f6e165 suspend2-userui-0.6.3-r1.ebuild 1642
-SHA256 21204fdb947050d545c0d22133bbef73f9118793ecf973ffc9b02901041693fc suspend2-userui-0.6.3-r1.ebuild 1642
 EBUILD suspend2-userui-0.6.4-r1.ebuild 1814 RMD160 85f4b88040fb351d7c88640694f7c9493d755451 SHA1 57089c6b82a106b11d01b2652430ad3a0f40c0ad SHA256 295af1d12a9405bb1d6a233cb298cca17ec162d4dc7142fc9aec52593daab4c7
 MD5 060f7f57385fdb9358a51bae1f4d4d83 suspend2-userui-0.6.4-r1.ebuild 1814
 RMD160 85f4b88040fb351d7c88640694f7c9493d755451 suspend2-userui-0.6.4-r1.ebuild 1814
 SHA256 295af1d12a9405bb1d6a233cb298cca17ec162d4dc7142fc9aec52593daab4c7 suspend2-userui-0.6.4-r1.ebuild 1814
-EBUILD suspend2-userui-0.6.4.ebuild 1597 RMD160 b197147a9d52e842ce9774f85a0d803872192fd8 SHA1 d520e444d0346770715476ccdb7eb0bfd2ad8ad0 SHA256 15a6c3a4b8831ef97347256429159e6ea8563be116d2929b184686fd4eb1ea10
-MD5 451b964a8d3b95567e5f888c53b1f6a8 suspend2-userui-0.6.4.ebuild 1597
-RMD160 b197147a9d52e842ce9774f85a0d803872192fd8 suspend2-userui-0.6.4.ebuild 1597
-SHA256 15a6c3a4b8831ef97347256429159e6ea8563be116d2929b184686fd4eb1ea10 suspend2-userui-0.6.4.ebuild 1597
-MISC ChangeLog 3071 RMD160 70aa1076b267c3ae481159ac6d13b16110b5b8bb SHA1 39ba4edae8d3abd5fbdb56c02e2e3dde4f0fc2d4 SHA256 e3b2417522955c971cc6c21508f282e4ad4bd2d40acf519369b717d300dd5f2f
-MD5 2136e9cb52c8062310ab2a93c841c04d ChangeLog 3071
-RMD160 70aa1076b267c3ae481159ac6d13b16110b5b8bb ChangeLog 3071
-SHA256 e3b2417522955c971cc6c21508f282e4ad4bd2d40acf519369b717d300dd5f2f ChangeLog 3071
+MISC ChangeLog 3299 RMD160 ea0d012149689c0a23ffe2d241dc04914029ae6d SHA1 acc8640c04c4f612c74ea335ca6f1009c98c589a SHA256 29a6dfda8077c4cadf2317d8bbac22ea0e9700f08142d004fec0052755958029
+MD5 445ecd03fb0565d8ca2fbc29e093cd7a ChangeLog 3299
+RMD160 ea0d012149689c0a23ffe2d241dc04914029ae6d ChangeLog 3299
+SHA256 29a6dfda8077c4cadf2317d8bbac22ea0e9700f08142d004fec0052755958029 ChangeLog 3299
 MISC metadata.xml 247 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b SHA1 edc7253d34677f69b45bbcee472908989269cd5d SHA256 330b68cdad708d1490b912def754cef1be6c0b15e903977951dbbe283cd85ceb
 MD5 270d3b4ec6bc63c529761a90458eb929 metadata.xml 247
 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b metadata.xml 247
 SHA256 330b68cdad708d1490b912def754cef1be6c0b15e903977951dbbe283cd85ceb metadata.xml 247
-MD5 4989e8ce8a7fa00ac2be8b099fb14c50 files/digest-suspend2-userui-0.6.3-r1 265
-RMD160 17ea9dd6f7739952fdc8a70de55348b487b138f8 files/digest-suspend2-userui-0.6.3-r1 265
-SHA256 be8981601c9a3ef3022498c45d37507b6dfc7321c2527237fcdb14715f0bde29 files/digest-suspend2-userui-0.6.3-r1 265
-MD5 a042dcb3843107867683e3a673af1ef7 files/digest-suspend2-userui-0.6.4 262
-RMD160 5b87fa9d284c99c6ab0e8781c2f421a1aa45733b files/digest-suspend2-userui-0.6.4 262
-SHA256 61eb66b0d1215949059ebef4b8c55ef87f0bb5264ba3e89d91f7dc943a17555f files/digest-suspend2-userui-0.6.4 262
 MD5 a042dcb3843107867683e3a673af1ef7 files/digest-suspend2-userui-0.6.4-r1 262
 RMD160 5b87fa9d284c99c6ab0e8781c2f421a1aa45733b files/digest-suspend2-userui-0.6.4-r1 262
 SHA256 61eb66b0d1215949059ebef4b8c55ef87f0bb5264ba3e89d91f7dc943a17555f files/digest-suspend2-userui-0.6.4-r1 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFouBgQlM6RnzZP+IRAgVNAKCvZAjCAtcWRGpdpX4OvPVZ9GPcPwCfQyEb
-d99eQKDF16wBmn0FLC6GnCM=
-=PGfq
------END PGP SIGNATURE-----
diff --git a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.3-r1 b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.3-r1
deleted file mode 100644
index 8f6817c50ca9..000000000000
--- a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d3a51d821da88149298ed4aa3118c3e suspend2-userui-0.6.3.tar.gz 388915
-RMD160 2a04eff1ff471770a1472d9e4f7075f5f4342acc suspend2-userui-0.6.3.tar.gz 388915
-SHA256 08a98b3fc8388fb06b63d6367ddb5107efc9663ac6a7866f696a17935ecd4cb4 suspend2-userui-0.6.3.tar.gz 388915
diff --git a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4 b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4
deleted file mode 100644
index b69cd4626edc..000000000000
--- a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4
+++ /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/suspend2-userui-0.6.3-skewed-image.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.3-skewed-image.patch
deleted file mode 100644
index 0f3cc9a5f7f6..000000000000
--- a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.3-skewed-image.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: fbsplash/userui_fbsplash_core.c
-===================================================================
---- fbsplash/userui_fbsplash_core.c	(revision 997)
-+++ fbsplash/userui_fbsplash_core.c	(working copy)
-@@ -154,8 +154,8 @@
- 	}
- 	memcpy(base_image, (void*)silent_img.data, base_image_size);
- 
--	frame_buffer = mmap(NULL, base_image_size, PROT_READ | PROT_WRITE,
--			MAP_SHARED, fb_fd, 0);
-+	frame_buffer = mmap(NULL, fb_fix.line_length * fb_var.yres,
-+			PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
- 	if (frame_buffer == MAP_FAILED) {
- 		frame_buffer = NULL;
- 	}
-@@ -183,7 +183,7 @@
- 	config_file = NULL;
- 
- 	if (frame_buffer) {
--		munmap(frame_buffer, base_image_size);
-+		munmap(frame_buffer, fb_fix.line_length * fb_var.yres);
- 		frame_buffer = NULL;
- 	}
- 
-@@ -203,15 +203,24 @@
- }
- 
- static void update_fb_img() {
-+	int y;
-+	int img_line_length = fb_var.xres * ((fb_var.bits_per_pixel + 7) >> 3);
-+
- 	if (!silent_img.data)
- 		return;
- 
--	/* Try mmap'd I/O first */
- 	if (frame_buffer) {
--		memcpy(frame_buffer, silent_img.data, base_image_size);
-+		/* Try mmap'd I/O if we have it */
-+		for (y = 0; y < fb_var.yres; y++) {
-+			memcpy(frame_buffer + y * fb_fix.line_length,
-+					silent_img.data + (y * img_line_length),
-+					img_line_length);
-+		}
- 	} else if (fb_fd != -1) {
--		lseek(fb_fd, 0, SEEK_SET);
--		write(fb_fd, silent_img.data, base_image_size);
-+		for (y = 0; y < fb_var.yres; y++) {
-+			lseek(fb_fd, y * fb_fix.line_length, SEEK_SET);
-+			write(fb_fd, silent_img.data + (y * img_line_length), img_line_length);
-+		}
- 	}
- }
- 
diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.3-skewed-text.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.3-skewed-text.patch
deleted file mode 100644
index 642628efc07d..000000000000
--- a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.3-skewed-text.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsplash/ttf.c
-===================================================================
---- fbsplash/ttf.c	(revision 997)
-+++ fbsplash/ttf.c	(working copy)
-@@ -638,7 +638,7 @@
- 				j -= glyph->minx;
- 			}
- 			
--			dst = (unsigned char *)target + i*fb_fix.line_length + j*bytespp;
-+			dst = (unsigned char *)target + (i * fb_var.xres + j)*bytespp;
- 			src = current->buffer + row*current->pitch;
- 
- 			add = x & 1;
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.3-r1.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.3-r1.ebuild
deleted file mode 100644
index e19ff88dedcb..000000000000
--- a/sys-apps/suspend2-userui/suspend2-userui-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 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.3-r1.ebuild,v 1.3 2006/04/30 17:48:29 brix 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}-skewed-image.patch
-	epatch ${FILESDIR}/${P}-skewed-text.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" suspend2ui_text \
-		|| die "emake suspend2ui_text failed"
-
-	if use fbsplash; then
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" fbsplash \
-			|| die "emake fbsplash failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 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.gz for further"
-	einfo "instructions."
-	einfo
-}
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.4.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.4.ebuild
deleted file mode 100644
index b7fd445084e3..000000000000
--- a/sys-apps/suspend2-userui/suspend2-userui-0.6.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.2 2006/06/06 18:15:11 brix 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}-remove-debug.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" suspend2ui_text \
-		|| die "emake suspend2ui_text failed"
-
-	if use fbsplash; then
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" fbsplash \
-			|| die "emake fbsplash failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" 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.gz for further"
-	einfo "instructions."
-	einfo
-}