Add missing dep, bug #443280 by Joost Ruis; drop old.

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

4 files changed, 20 insertions, 79 deletions

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index c0c69070bd38..a03955d95d04 100644
--- a/sys-apps/tuxonice-userui/ChangeLog
+++ b/sys-apps/tuxonice-userui/ChangeLog
@@ -1,6 +1,10 @@
 # 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.28 2012/11/07 18:05:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.29 2012/11/15 19:21:32 pacho Exp $
+
+  15 Nov 2012; Pacho Ramos <pacho@gentoo.org> -tuxonice-userui-1.1-r1.ebuild,
+  tuxonice-userui-1.1-r2.ebuild:
+  Add missing dep, bug #443280 by Joost Ruis; drop old.
 
 *tuxonice-userui-1.1-r2 (07 Nov 2012)
 
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
index 971f8db13b8c..9ed3e23dfa6c 100644
--- a/sys-apps/tuxonice-userui/Manifest
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -7,14 +7,13 @@ DIST tuxonice-userui-1.0.tar.gz 66922 SHA256 2da4a5eb4597fce89a43cac5e794e19a000
 DIST tuxonice-userui-1.1.tar 3317760 SHA256 dfbd5c9f5b07c17502a3d96df58be38d53268b088f095186d955e9bba4324d3a SHA512 b837e3302437ccfcc7e984817c52576be27c774681abc18b1ad34990eab342b5d11ec13cf48cfef07f419f425c111715843c7ca427a1d4778bd48f1d7352684a WHIRLPOOL c15bb0c0ea17bc9f34343175450919361afd22feea06a4d6e013fabff8a9aee1c1d0fe8cffb87ebc56080e823bd608fe377f81e96b916c71c06971a28722738a
 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
-EBUILD tuxonice-userui-1.1-r2.ebuild 1822 SHA256 4cc252762a9d5eaf4f3fcaf2229abcd06587fc5ce3b07adabcd3599c687dcb7b SHA512 652aa6a9267498b4e36c846364922813d71054cff69b2174202378dc13c8895a367ad25294fe2f4870a4a7d3a944a8c7c514dc974d0ddaa4de37a41295fcc952 WHIRLPOOL 92ccefed721a2a23a032d53420b5436dd1ca74369f0041da4538117596b79085d2cd6f8101f1d8653fe49f50b59a8911142a5a4cdf4d37fa6b7ac8aa8d5328bc
-MISC ChangeLog 9233 SHA256 7500f5f499c1284def2156acd76e27d671652d7c40a19f820707337e4e9ebbb9 SHA512 67046f611dd7875cf3689f07ccd2d45b5df6c304344e66e64eff345559444a83062959a7f8fe8385f1edece439e9daec5324f45e63be9b5c76a2a8892912263e WHIRLPOOL 166d655f20c5d67840d330709d6560ea500f12d68d6d45bb5631c4e9f4e5fe6f76c47326800e1bac497d6f2e3994ec9dfd9a535303d8572b60b9a458e3c08168
+EBUILD tuxonice-userui-1.1-r2.ebuild 1846 SHA256 1cc456004136c961b88976d01428297c90c83f39b3ed6bde34a4390844a52768 SHA512 39a8b427fff758e410e2ec0617faff0d29f1571bc0770ad64bbc49a345fdc1a75a9ef8eed9742e85d2f7471399113f0d83113f07167ff35d96d08ba49a1ded6f WHIRLPOOL ec82ad22d7f12d3aab29f20242ae170dda8206909b95e3c06fe8dd7e95481e0da77fb926abb866866615b85b7fb83bd0886c29318c524826461e8e941b0068aa
+MISC ChangeLog 9401 SHA256 8ca8965e6083f436db5f2ef3a1923547b4d3f4d38aaa45cae53daef41ed6cc15 SHA512 022fab14b107be19ea5a0b3c7adde9940ce0cd9a5efef074e6d7447ad6858390156299cafe9d67192283c588dadc8c0e14d504f6986a7fa6173a6fe83eca47cb WHIRLPOOL 6edde5fedecbe6e472b898d5b20baf40ef5281cfb06abb5786eb1e3460d04f5e6f14b8bd5ffec3a6b655d52bc6eec5ef1983bde65ce48b0e313aae2916f92122
 MISC metadata.xml 429 SHA256 969993da264e9371286d0cd76a5730011276a4af6bb2c4dad6de146f3b0d24d5 SHA512 3b71377dfba35ea4d269a130b7a12d923e97ef96bd4709c2d49b56654a65fad0b49ce4b333d15e9e3c9d8c0633f969718af1e6caf8cc97b34f40aa5921ade235 WHIRLPOOL 7c6fd6de3ac0255b7214950d69582423a9bd3a6ce72b28e9d77c1f020fbdb4d20a837f9f9887a2d512c38eff092c73b4a21c95a935120b2c5d5ea994fef4207d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCaouMACgkQCaWpQKGI+9SYYgCfWSIAyD1G/2kBGeWPHBMLmHRj
-uMIAn2zqn16zoMQTcCIcbNznBY8uNLwa
-=g//8
+iEYEAREIAAYFAlClQL4ACgkQCaWpQKGI+9SYoQCZAZH9hzsoz8sbtOGlxj2atKOD
+QhEAmwTYyMFez00JDh4Sk0z1VF6muxw3
+=GCKm
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r1.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r1.ebuild
deleted file mode 100644
index ac729bcc06d9..000000000000
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-r1.ebuild,v 1.2 2012/10/28 12:35:07 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
-
-	emake CC="$(tc-getCC)" USE_FBSPLASH=$(use fbsplash && echo 1 || echo 0) \
-		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
-}
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
index 00259d7226cd..6dc0222ea915 100644
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild,v 1.2 2012/11/15 19:21:32 pacho Exp $
 
 EAPI=4
 inherit toolchain-funcs eutils
@@ -15,12 +15,15 @@ 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] )"
+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]
+		virtual/jpeg
+		)"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"