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

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 15 insertions, 73 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/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}"