Add patch for help option by Thomas A. (Arch Tester) <gentoofan23@gmail.com>. Write a build system in the ebuild as scons is freaking out. This negates earlier keywording, delete 1.08 ebuild and restart keywording from scratch.

(Portage version: 2.1.3.15)

5 files changed, 70 insertions, 35 deletions

diff --git a/sys-apps/lcdtest/ChangeLog b/sys-apps/lcdtest/ChangeLog
index ca031cdb31a8..e26759ad0d95 100644
--- a/sys-apps/lcdtest/ChangeLog
+++ b/sys-apps/lcdtest/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/lcdtest
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/ChangeLog,v 1.7 2007/10/22 15:19:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/ChangeLog,v 1.8 2007/10/22 21:41:20 chainsaw Exp $
+
+*lcdtest-1.08-r1 (22 Oct 2007)
+
+  22 Oct 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.08-help-option.patch, -lcdtest-1.08.ebuild,
+  +lcdtest-1.08-r1.ebuild:
+  Add patch for help option by Thomas A. (Arch Tester)
+  <gentoofan23@gmail.com>. Write a build system in the ebuild as scons is
+  freaking out. This negates earlier keywording, delete 1.08 ebuild and
+  restart keywording from scratch.
 
   22 Oct 2007; Tony Vroon <chainsaw@gentoo.org> lcdtest-1.08.ebuild:
   Mark stable on X86 as per bug #195218.
diff --git a/sys-apps/lcdtest/files/1.08-help-option.patch b/sys-apps/lcdtest/files/1.08-help-option.patch
new file mode 100644
index 000000000000..19254997cef9
--- /dev/null
+++ b/sys-apps/lcdtest/files/1.08-help-option.patch
@@ -0,0 +1,12 @@
+--- lcdtest-1.08/src/lcdtest.c	2007-06-05 19:38:23.000000000 -0400
++++ lcdtest.c	2007-10-22 13:04:09.000000000 -0400
+@@ -680,7 +680,8 @@
+     {
+       argv++;
+       if ((strcmp (argv [0], "--help") == 0) ||
+-	  (strcmp (argv [0], "-?") == 0))
++	  (strcmp (argv [0], "-?") == 0) ||
++	  (strcmp (argv [0], "-h") ==0))
+ 	{
+ 	  usage (stderr);
+ 	  help (stderr);
diff --git a/sys-apps/lcdtest/files/digest-lcdtest-1.08 b/sys-apps/lcdtest/files/digest-lcdtest-1.08-r1
index aac23e441893..aac23e441893 100644
--- a/sys-apps/lcdtest/files/digest-lcdtest-1.08
+++ b/sys-apps/lcdtest/files/digest-lcdtest-1.08-r1
diff --git a/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild b/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild
new file mode 100644
index 000000000000..cb26cde19347
--- /dev/null
+++ b/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/lcdtest-1.08-r1.ebuild,v 1.1 2007/10/22 21:41:20 chainsaw Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Displays test patterns to spot dead/hot pixels on LCD screens"
+HOMEPAGE="http://www.brouhaha.com/~eric/software/lcdtest/"
+SRC_URI="http://www.brouhaha.com/~eric/software/lcdtest/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE=""
+RDEPEND=">=media-libs/libsdl-1.2.7-r2
+	>=media-libs/sdl-image-1.2.3-r1"
+DEPEND="$RDEPEND
+	>=media-libs/netpbm-10.28
+	>=sys-apps/sed-4.1.4"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-help-option.patch"
+}
+
+src_compile() {
+	tc-export CC CXX
+	cd "${S}/src"
+	ebegin "Running first stage compilation"
+	"${CC}" -o lcdtest.o -c ${CFLAGS} -DRELEASE=${PV} lcdtest.c || die lcdtest compilation failed
+	"${CC}" -o SFont.o -c ${CFLAGS} -DRELEASE=${PV} SFont.c || die SFont compilation failed
+	eend $?
+	einfo "Generating font"
+	pngtopnm 14P_Arial_Plain_Red.png > help_font.ppm || pngtopnm failed
+	ppmtoxpm -name `basename help_font.ppm .ppm`_xpm help_font.ppm |
+	sed 's/static //;s/black/#000000/;s/magenta/#FF00FF/;s/#E40808/#009900/' > help_font.c || ppmtoxpm failed
+	ebegin "Running final stage compilation"
+	"${CC}" -o help_font.o -c ${CFLAGS} -DRELEASE=${PV} help_font.c || die help_font compilation failed
+	"${CC}" -o lcdtest lcdtest.o SFont.o help_font.o -lSDL -lSDL_image || die final link failed
+	eend $?
+}
+
+src_install() {
+	dobin src/lcdtest
+	doman man/lcdtest.1
+	dodoc README
+}
diff --git a/sys-apps/lcdtest/lcdtest-1.08.ebuild b/sys-apps/lcdtest/lcdtest-1.08.ebuild
deleted file mode 100644
index 69ff6aa3aef2..000000000000
--- a/sys-apps/lcdtest/lcdtest-1.08.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/lcdtest-1.08.ebuild,v 1.2 2007/10/22 15:19:19 chainsaw Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Displays test patterns to spot dead/hot pixels on LCD screens"
-HOMEPAGE="http://www.brouhaha.com/~eric/software/lcdtest/"
-SRC_URI="http://www.brouhaha.com/~eric/software/lcdtest/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc ~ppc64"
-IUSE=""
-RDEPEND=">=media-libs/libsdl-1.2.7-r2
-	>=media-libs/sdl-image-1.2.3-r1"
-DEPEND="$RDEPEND
-	>=dev-util/scons-0.97
-	>=media-libs/netpbm-10.28
-	>=sys-apps/sed-4.1.4"
-
-src_compile() {
-	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
-	[[ ${MAKEOPTS/-s/} != ${MAKEOPTS} ]] && sconsopts="${sconsopts} -s"
-
-	tc-export CC CXX
-
-	CFLAGS="${CFLAGS}" scons ${sconsopts} || die
-}
-
-src_install() {
-	dobin build/lcdtest
-	doman man/lcdtest.1
-	dodoc README
-}