FBSPLASH support is always compiled by error, bug #440110 by Sergey Popov.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 76 insertions, 5 deletions

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 1be63a378abd..c0c69070bd38 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.27 2012/10/28 12:35:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.28 2012/11/07 18:05:22 pacho Exp $
+
+*tuxonice-userui-1.1-r2 (07 Nov 2012)
+
+  07 Nov 2012; Pacho Ramos <pacho@gentoo.org> +tuxonice-userui-1.1-r2.ebuild:
+  FBSPLASH support is always compiled by error, bug #440110 by Sergey Popov.
 
   28 Oct 2012; Pacho Ramos <pacho@gentoo.org> tuxonice-userui-1.1-r1.ebuild:
   Rephrase elog information to be a bit more general (#439120#c11 by Robert
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
index c08cebc9ae40..971f8db13b8c 100644
--- a/sys-apps/tuxonice-userui/Manifest
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -8,12 +8,13 @@ DIST tuxonice-userui-1.1.tar 3317760 SHA256 dfbd5c9f5b07c17502a3d96df58be38d5326
 DIST tuxonice-userui_1.1-2~exp1.debian.tar.gz 7628 SHA256 042936fe036563706d9db6e04750d890706dde8d90d51dfcbf64a7328653f427 SHA512 5aebc331452f9d8cac3f3d4db9fcc04c5a68759df2236a70a9fdf5c6e03da27170b1db71031b4b9bb2939c4e5a98c4755d26b6ebf0f81362a71c35e77b688f0b WHIRLPOOL 47b3dd3c6aa310200f04902b62861f0abd98656133432ab1b160ad03e7f79838ab1adac7c9be8b6c5302267b92890f5a712cf41cf7917e480b4009b8efedbc1c
 EBUILD tuxonice-userui-1.0.ebuild 1772 SHA256 de8acd072e7c316543eaad166c43847b363d8a54afd7b89da89264ab67d4ccf8 SHA512 07cef7d10006ada6cb7252c71c6652ae76e61ebca4a8b1957212efa28ec3af192c2335414fa35f8364b9249c19061f0d823036275ae0820e4bdada0614e2a338 WHIRLPOOL f7f328873dd6f8b77e04acf2b17eb45149d5683b32a397466b94e62f861cb60566f8342195a917eebb868d68b668df87a1c9d339b9448983d711ae98c71a1163
 EBUILD tuxonice-userui-1.1-r1.ebuild 1808 SHA256 278585a77c4c467301215433a751538b657209e20b22eaaf257c7d5994ee62ca SHA512 9f1413f2105adf6d4444fd2c8096c10c1a1f403d5582c86beaab28e67f8ba401d096076e328054965f10d2b94e37ab5c90edf470fd1198930326981016999fd9 WHIRLPOOL 00ec9b67154e0bd98083623d278111d0769d713e786121a4a474111cf83ddabc1b28189c05066ea55e30d6036bcdf2dbc35c0664bbd5f31e3c2a9a9f7ebef95a
-MISC ChangeLog 9038 SHA256 264508679fafb035327e35220b610f374e2c186fa0b919e743b615c50ddc53aa SHA512 60b3a2a0156b8d3881dfa839385e7851a7d671057350350b05fad009caef31e4e26798ca74b30663dc1d156431f286cf664ff27e37392ed5c659018d4cc85357 WHIRLPOOL 8a2d6a5ecf46e58dc8a2f6b3c72ab919480865fc0f368f267077aa8b96f3275848da24ea5a5d9c4d7a310511f31486aaa4c7f3874aaed257d6bcc5e90a7f0fa8
+EBUILD tuxonice-userui-1.1-r2.ebuild 1822 SHA256 4cc252762a9d5eaf4f3fcaf2229abcd06587fc5ce3b07adabcd3599c687dcb7b SHA512 652aa6a9267498b4e36c846364922813d71054cff69b2174202378dc13c8895a367ad25294fe2f4870a4a7d3a944a8c7c514dc974d0ddaa4de37a41295fcc952 WHIRLPOOL 92ccefed721a2a23a032d53420b5436dd1ca74369f0041da4538117596b79085d2cd6f8101f1d8653fe49f50b59a8911142a5a4cdf4d37fa6b7ac8aa8d5328bc
+MISC ChangeLog 9233 SHA256 7500f5f499c1284def2156acd76e27d671652d7c40a19f820707337e4e9ebbb9 SHA512 67046f611dd7875cf3689f07ccd2d45b5df6c304344e66e64eff345559444a83062959a7f8fe8385f1edece439e9daec5324f45e63be9b5c76a2a8892912263e WHIRLPOOL 166d655f20c5d67840d330709d6560ea500f12d68d6d45bb5631c4e9f4e5fe6f76c47326800e1bac497d6f2e3994ec9dfd9a535303d8572b60b9a458e3c08168
 MISC metadata.xml 429 SHA256 969993da264e9371286d0cd76a5730011276a4af6bb2c4dad6de146f3b0d24d5 SHA512 3b71377dfba35ea4d269a130b7a12d923e97ef96bd4709c2d49b56654a65fad0b49ce4b333d15e9e3c9d8c0633f969718af1e6caf8cc97b34f40aa5921ade235 WHIRLPOOL 7c6fd6de3ac0255b7214950d69582423a9bd3a6ce72b28e9d77c1f020fbdb4d20a837f9f9887a2d512c38eff092c73b4a21c95a935120b2c5d5ea994fef4207d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNJnwACgkQCaWpQKGI+9T62gCfbGtWCGwbTTnX5tAsrAlkhhP6
-JOIAn3wVtxti6AKyisaq7RawAhw4A5P3
-=QsnQ
+iEYEAREIAAYFAlCaouMACgkQCaWpQKGI+9SYYgCfWSIAyD1G/2kBGeWPHBMLmHRj
+uMIAn2zqn16zoMQTcCIcbNznBY8uNLwa
+=g//8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
new file mode 100644
index 000000000000..00259d7226cd
--- /dev/null
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild,v 1.1 2012/11/07 18:05:22 pacho Exp $
+
+EAPI=4
+inherit toolchain-funcs eutils
+
+DESCRIPTION="User Interface for TuxOnIce"
+HOMEPAGE="http://www.tuxonice.net"
+SRC_URI="http://tuxonice.net/files/${P}.tar.gz -> ${P}.tar
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV}-2~exp1.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="fbsplash"
+DEPEND="fbsplash? ( >=media-gfx/splashutils-1.5.2.1
+	media-libs/libmng[lcms]
+	>=media-libs/libpng-1.4.8[static-libs]
+	media-libs/freetype[static-libs]
+	|| ( <app-arch/bzip2-1.0.6-r3[static] >=app-arch/bzip2-1.0.6-r3[static-libs] )
+	media-libs/lcms:0[static-libs] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	local d=${WORKDIR}/debian/patches
+	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
+	sed -i -e 's/make/$(MAKE)/' Makefile || die
+}
+
+src_compile() {
+	# Package contain binaries
+	emake clean || die "emake clean failed"
+
+	use fbsplash && export USE_FBSPLASH=1
+	emake CC="$(tc-getCC)" tuxoniceui || die "emake tuxoniceui failed"
+}
+
+src_install() {
+	into /
+	dosbin tuxoniceui
+	dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
+}
+
+pkg_postinst() {
+	if use fbsplash; then
+		einfo
+		elog "You must create a symlink from /etc/splash/tuxonice"
+		elog "to the theme you want tuxonice to use, e.g.:"
+		elog
+		elog "  # ln -sfn /etc/splash/emergence /etc/splash/tuxonice"
+		if [[ ${REPLACING_VERSIONS} < 1.1 ]]; then
+			einfo
+			elog "You must refer to '/sbin/tuxoniceui -f' instead of /sbin/tuxoniceui_fbsplash'"
+			elog "in all places you set it."
+		fi
+	fi
+	einfo
+	einfo "Please see /usr/share/doc/${PF}/README.* for further"
+	einfo "instructions."
+	einfo
+}