Restore fbsplash USE flag.

Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.28-tuxonice x86_64

4 files changed, 75 insertions, 9 deletions

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 0105c6f6c76d..0e62dd8a80f7 100644
--- a/sys-apps/tuxonice-userui/ChangeLog
+++ b/sys-apps/tuxonice-userui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/tuxonice-userui
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.8 2009/01/08 20:11:26 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.9 2009/01/14 19:23:41 nelchael Exp $
+
+  14 Jan 2009; <nelchael@gentoo.org>
+  +files/tuxonice-userui-0.7.3-Makefiles.patch,
+  tuxonice-userui-0.7.3.ebuild:
+  Restore fbsplash USE flag.
 
 *tuxonice-userui-0.7.3 (08 Jan 2009)
 
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
index 93120deeb809..4841b4b6b037 100644
--- a/sys-apps/tuxonice-userui/Manifest
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tuxonice-userui-0.7.3-Makefiles.patch 1454 RMD160 826303ed469c4acaea2b8a72c5f066b594058e13 SHA1 9e9972923d599d93b55ce775a1e457ba32441600 SHA256 fd638d8405033e9b763c20619beb25dedf803e55ba3603b9f7f6e6912e5255e7
 DIST suspend2-userui-0.7.2-fbsplash.patch.bz2 36614 RMD160 1cb0286bc0c0beb0ccf11516b3c641a2a3e3ccb8 SHA1 cf9e981f01fd43a747fbd5d2cb6d6bd2ad735867 SHA256 3e9821c303632b6abbe5759d7bbbd2c24f591fafc1c530791b83f1827c4dcb5c
 DIST suspend2-userui-0.7.2.tar.gz 2850261 RMD160 4d5033ff5fa250792837b50e17eba299808e53ba SHA1 1057ec4088450b34a936a6c500167440d461a988 SHA256 7b3afb0c4bc2c1b2668d01413b1aa0bb1fd971fe59c3001aa829db0ebe04384e
 DIST tuxonice-userui-0.7.3.tar.gz 66229 RMD160 76e5e2fe3a27b585704d08c632089563abb16c1e SHA1 a0c468662c61cfb5680e9b3ab70cab44030beb4e SHA256 7222a30231f3b11d7ce931c9bbf4ae1197a4d4be24eafc6c8ab2ec2d92b0e139
 EBUILD tuxonice-userui-0.7.2.ebuild 1552 RMD160 5d4019ad71a3e180981a5ac4742016a842aaebf7 SHA1 3c0f92780e266e0cf3c2a8265d89ccd887fa53e1 SHA256 9fb350a7c7fc0cf3e1b3977b41ba8ae2d827ff3a3772ecf5a2d0d43258c19316
-EBUILD tuxonice-userui-0.7.3.ebuild 918 RMD160 a149fd7ed70394e1e396444c4f602c678fcf0a8e SHA1 cd1ad5860209f8d6691807bd817c13c606c15734 SHA256 9d8a647c9ab6a3082bfc522e5be587bad57ecc4ce744804cf69d90b8cc526d80
-MISC ChangeLog 6061 RMD160 031a3299c6f866d29b2fce8a8d268e0274feb541 SHA1 52161e887eb7b1be6de227d5140dc1706b018745 SHA256 241ff457ac9d6276c3e4a07a23bd14ec942c67a1dd443f45c77a28006a89fba4
+EBUILD tuxonice-userui-0.7.3.ebuild 1454 RMD160 0b60e4700fe13d8d892ea0cf735b9b1bf372d2fb SHA1 c0cc357a88a8f013aa2bbd85305da48f75c0a749 SHA256 ca02e32aaca9a75e296cb2e63794711dcb301e90ad234919289bb96f5a84d9a8
+MISC ChangeLog 6208 RMD160 5b6f08843584bd64f7c479397b0eced6ec465005 SHA1 b24787a3dd817caf805cf6532de3c7e95e7f92b2 SHA256 573f4b7b10327f0d47f63056e99d50b785fdf07fe4f8d430d7ff02bbddd7dd69
 MISC metadata.xml 338 RMD160 d3ae9ef88f8d10bc999ada3df1671dc59689881e SHA1 1a36f5e5060e3e5bf56c32b288f18c61bc7d836c SHA256 5423523fae713a53028e4bdc76e4f3be5fcae848d3bcb62990bfab4782f242eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklmXfQACgkQgo/w9rxVVVECtACfXwW2T5weuJWS8CrC3cM4f2xr
-g9gAnil2Fk6TF/2RSzH4i4EHHImK5NUG
-=hiLi
+iEYEARECAAYFAkluO8IACgkQgo/w9rxVVVGXWwCfXqYdBAjZVS5W1vjPCynV+cnH
+sy0AnjdsUngp66olPZLeYQHPett+veO8
+=XWmi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-0.7.3-Makefiles.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-0.7.3-Makefiles.patch
new file mode 100644
index 000000000000..353b66d95ab3
--- /dev/null
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-0.7.3-Makefiles.patch
@@ -0,0 +1,45 @@
+diff -Nru tuxonice-userui-0.7.3.vanilla/Makefile tuxonice-userui-0.7.3/Makefile
+--- tuxonice-userui-0.7.3.vanilla/Makefile	2009-01-14 19:16:14.000000000 +0000
++++ tuxonice-userui-0.7.3/Makefile	2009-01-14 19:19:21.000000000 +0000
+@@ -32,15 +32,15 @@
+ all: $(TARGETS)
+ 
+ fbsplash:
+-	make -C $@ all
++	$(MAKE) -C $@ all
+ 
+ usplash:
+-	make -C $@ all
++	$(MAKE) -C $@ all
+ 
+ tuxoniceui_text: $(CORE_OBJECTS) userui_text.o
+ 	$(CC) $(LDFLAGS) -static $^ -o $@
+ 
+-tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS) fbsplash/userui_fbsplash.o
++tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS)
+ 	$(CC) $(LDFLAGS) -static $(CORE_OBJECTS) fbsplash/userui_fbsplash.o -o $@ $(FBSPLASH_LIBS)
+ 
+ tuxoniceui_usplash: usplash $(CORE_OBJECTS) usplash/userui_usplash.o
+@@ -48,8 +48,8 @@
+ 
+ clean:
+ 	$(RM) *.o $(TARGETS)
+-	make -C fbsplash clean
+-	make -C usplash clean
++	$(MAKE) -C fbsplash clean
++	$(MAKE) -C usplash clean
+ 
+ $(INSTDIR)/%: %
+ 	strip $<
+diff -Nru tuxonice-userui-0.7.3.vanilla/fbsplash/Makefile tuxonice-userui-0.7.3/fbsplash/Makefile
+--- tuxonice-userui-0.7.3.vanilla/fbsplash/Makefile	2009-01-14 19:16:14.000000000 +0000
++++ tuxonice-userui-0.7.3/fbsplash/Makefile	2009-01-14 19:17:55.000000000 +0000
+@@ -6,7 +6,7 @@
+ 		parse.o mng_callbacks.o mng_render.o render.o ttf.o
+ SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
+ 
+-all: $(TARGET)
++all: $(TARGET) $(OBJECTS)
+ 
+ userui_fbsplash.o: $(OBJECTS)
+ 	$(CC) $(LDFLAGS) -r -nostdlib -nostartfiles $(SPLASH_LDLIBS) $^ -o $@
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild
index 62b1cbaa21c0..601239db9d2a 100644
--- a/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild,v 1.1 2009/01/08 20:11:26 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild,v 1.2 2009/01/14 19:23:41 nelchael Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,11 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
-DEPEND=""
+IUSE="fbsplash"
+DEPEND="fbsplash? (	>=media-gfx/splashutils-1.5.2.1 )"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-Makefiles.patch"
 }
 
 src_compile() {
@@ -25,15 +27,28 @@ src_compile() {
 
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		tuxoniceui_text || die "emake tuxoniceui_text failed"
+
+	if use fbsplash; then
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+			tuxoniceui_fbsplash || die "emake tuxoniceui_fbsplash failed"
+	fi
 }
 
 src_install() {
 	into /
 	dosbin tuxoniceui_text
+	use fbsplash && dosbin tuxoniceui_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/tuxonice"
+		einfo "to the theme you want tuxonice to use, e.g.:"
+		einfo
+		einfo "  # ln -sfn /etc/splash/emergence /etc/splash/tuxonice"
+	fi
 	einfo
 	einfo "Please see /usr/share/doc/${PF}/README.* for further"
 	einfo "instructions."