summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2009-06-04 19:08:20 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2009-06-04 19:08:20 +0000
commitb26874d568da81db4e31520d0f0931c1bc7a544b (patch)
treeedd984165cb4ed0cbeb981aa4db062cdb4862a84 /sys-apps/tuxonice-userui
parentVersion bump, incorporates the BSD portability patch by Flameeyes. More compi... (diff)
downloadgentoo-2-b26874d568da81db4e31520d0f0931c1bc7a544b.tar.gz
gentoo-2-b26874d568da81db4e31520d0f0931c1bc7a544b.tar.bz2
gentoo-2-b26874d568da81db4e31520d0f0931c1bc7a544b.zip
Remove old/unneeded versions.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/tuxonice-userui')
-rw-r--r--sys-apps/tuxonice-userui/ChangeLog7
-rw-r--r--sys-apps/tuxonice-userui/files/tuxonice-userui-0.7.3-Makefiles.patch45
-rw-r--r--sys-apps/tuxonice-userui/tuxonice-userui-0.7.2.ebuild61
-rw-r--r--sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild60
-rw-r--r--sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild6
5 files changed, 8 insertions, 171 deletions
diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 88184405f173..3511bf0a8d22 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.15 2009/06/03 22:06:08 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.16 2009/06/04 19:08:19 nelchael Exp $
+
+ 04 Jun 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+ -tuxonice-userui-0.7.2.ebuild, -tuxonice-userui-0.7.3.ebuild,
+ -files/tuxonice-userui-0.7.3-Makefiles.patch:
+ Remove old/unneeded versions.
03 Jun 2009; Dawid Węgliński <cla@gentoo.org>
tuxonice-userui-1.0.ebuild:
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
deleted file mode 100644
index 353b66d95ab3..000000000000
--- a/sys-apps/tuxonice-userui/files/tuxonice-userui-0.7.3-Makefiles.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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.2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-0.7.2.ebuild
deleted file mode 100644
index 855b592be53a..000000000000
--- a/sys-apps/tuxonice-userui/tuxonice-userui-0.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 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.2.ebuild,v 1.3 2008/03/24 11:00:01 maekke Exp $
-
-inherit toolchain-funcs eutils
-
-MY_P="suspend2-userui-${PV}"
-DESCRIPTION="User Interface for TuxOnIce"
-HOMEPAGE="http://www.tuxonice.net"
-SRC_URI="http://www.tuxonice.net/downloads/all/${MY_P}.tar.gz
- mirror://gentoo/${MY_P}-fbsplash.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="fbsplash"
-DEPEND="fbsplash? ( >=media-gfx/splashutils-1.5.2.1 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${WORKDIR}/${MY_P}-fbsplash.patch"
-}
-
-src_compile() {
- # Package contain binaries
- emake clean
-
- 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."
- einfo
-}
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild
deleted file mode 100644
index b4744382dc71..000000000000
--- a/sys-apps/tuxonice-userui/tuxonice-userui-0.7.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.3 2009/02/22 20:46:03 nelchael Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="User Interface for TuxOnIce"
-HOMEPAGE="http://www.tuxonice.net"
-SRC_URI="http://www.tuxonice.net/downloads/all/${P}.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] )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-Makefiles.patch"
-}
-
-src_compile() {
- # Package contain binaries
- emake clean
-
- 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."
- einfo
-}
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
index 7ac0fa6d5c72..1bdcd300ce44 100644
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.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-1.0.ebuild,v 1.3 2009/06/03 22:06:08 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.4 2009/06/04 19:08:19 nelchael Exp $
EAPI="2"
@@ -19,9 +19,7 @@ DEPEND="fbsplash? ( >=media-gfx/splashutils-1.5.2.1
media-libs/libmng[lcms] )"
RDEPEND="${DEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}/${P}-Makefiles.patch"
}