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.

Package-Manager: portage-2.1.3.15

6 files changed, 88 insertions, 49 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/Manifest b/sys-apps/lcdtest/Manifest
index 2b4b7966588b..d23b4a28f5de 100644
--- a/sys-apps/lcdtest/Manifest
+++ b/sys-apps/lcdtest/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.08-help-option.patch 360 RMD160 2e8addce02be99e57d1b9cb0931f5fc8383cc9e7 SHA1 bfbf591faee8dd8c235119739f9f6ee29c64ceac SHA256 246cf965102e548403cb115c85079132b7a3c71c2536718d783143dfc61ce580
+MD5 65b52dd88dbd9c503982df8e8386a7e4 files/1.08-help-option.patch 360
+RMD160 2e8addce02be99e57d1b9cb0931f5fc8383cc9e7 files/1.08-help-option.patch 360
+SHA256 246cf965102e548403cb115c85079132b7a3c71c2536718d783143dfc61ce580 files/1.08-help-option.patch 360
 DIST lcdtest-1.01.tar.gz 25974 RMD160 566bb981488ed91abaeb9ed075e6d9d6cd663e0b SHA1 64cf476f75d1f046e5d8e0dcda7c6b5d5cb49cf1 SHA256 6313ce628e2627e9fccd73a4273b983e452263bd5d91a26e33710abee00fb75b
 DIST lcdtest-1.02.tar.gz 29058 RMD160 b282f39039897fe8951d351945ad832c157d8108 SHA1 3e0796fbe3798e57f98ca28bd103eb2516c0760f SHA256 996e6da43b2d0c1e4a5cb49160e6f6a1c40326f378e38abeeccb1f286d7cb748
 DIST lcdtest-1.03.tar.gz 26739 RMD160 84a627b491a959d3b943f6273909ac7e077cb7e3 SHA1 07742e28128ddf082e9e1341f3d29b027e76da16 SHA256 6701efe2fa520b7957324c4a738c6e4b6670771a0da6fc225147690d6c1d8116
@@ -22,14 +26,14 @@ EBUILD lcdtest-1.04.ebuild 688 RMD160 9a4d51cdecde104934a7d004297b7382e3dd9b1d S
 MD5 8420a217598da5f08625cfc9fa9c3deb lcdtest-1.04.ebuild 688
 RMD160 9a4d51cdecde104934a7d004297b7382e3dd9b1d lcdtest-1.04.ebuild 688
 SHA256 18dd48509cec7a14a00af5168567cfe8621da91b6e01d4ab580ceba7323e7280 lcdtest-1.04.ebuild 688
-EBUILD lcdtest-1.08.ebuild 991 RMD160 67d170046333b3b13673911cb5a923713411a2d5 SHA1 60756cf9c9977f0117f6e8a5535c4a86ccb008d4 SHA256 c64ce05af483c30746733f18da21c7134baf53dd845093ee96976eddd8fb0fe7
-MD5 59ed1735383d54767f44db725112d70d lcdtest-1.08.ebuild 991
-RMD160 67d170046333b3b13673911cb5a923713411a2d5 lcdtest-1.08.ebuild 991
-SHA256 c64ce05af483c30746733f18da21c7134baf53dd845093ee96976eddd8fb0fe7 lcdtest-1.08.ebuild 991
-MISC ChangeLog 1562 RMD160 9f766eb28311ad127b71e7ed9b4d6d61c2b291f6 SHA1 cc9bb79abaf62faa287301935902faff1f2b145e SHA256 3bec515cc1c112fa8d8bceff18ab943ad9f69aba1dc8b9092be1ac1e30776768
-MD5 8f64aa2e54bc7dcf76da7cd08454b95e ChangeLog 1562
-RMD160 9f766eb28311ad127b71e7ed9b4d6d61c2b291f6 ChangeLog 1562
-SHA256 3bec515cc1c112fa8d8bceff18ab943ad9f69aba1dc8b9092be1ac1e30776768 ChangeLog 1562
+EBUILD lcdtest-1.08-r1.ebuild 1638 RMD160 c940415c04d70ac4623956218a7229d3bee4d632 SHA1 894c9fa11987c3047628d6a8b4c867105ead70e9 SHA256 d8db620ac678b765ee264b620cd462bf098bc72aaed2080441258a5eb73b2897
+MD5 b4605b82a98afd97854e0c9f2b8ee439 lcdtest-1.08-r1.ebuild 1638
+RMD160 c940415c04d70ac4623956218a7229d3bee4d632 lcdtest-1.08-r1.ebuild 1638
+SHA256 d8db620ac678b765ee264b620cd462bf098bc72aaed2080441258a5eb73b2897 lcdtest-1.08-r1.ebuild 1638
+MISC ChangeLog 1961 RMD160 cd540625aa6b6310062f1ed53b03f65816b87414 SHA1 e87944a01827231a07dfdfa33f0fa00c2d65f64b SHA256 82a297ddd9f966ee674592547b90298a3b56bdf433e6c4266f34f704faa7cf44
+MD5 016c2211e47ae2740be676ab4f577dd7 ChangeLog 1961
+RMD160 cd540625aa6b6310062f1ed53b03f65816b87414 ChangeLog 1961
+SHA256 82a297ddd9f966ee674592547b90298a3b56bdf433e6c4266f34f704faa7cf44 ChangeLog 1961
 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a metadata.xml 254
@@ -46,13 +50,13 @@ SHA256 6adb4c4689371a514c2198ad7324c95721deb9f8813d5f35538bace4b5e4729d files/di
 MD5 802a4371540ad226b9b255a839eb5502 files/digest-lcdtest-1.04 235
 RMD160 5e327a4771a5216ee4727d9b05b02a39e71d52c4 files/digest-lcdtest-1.04 235
 SHA256 08fca4399c61bfc57177a2a45899602a3958aa72eb952b88af54c5d6ab162043 files/digest-lcdtest-1.04 235
-MD5 7df8910bcd6424c79aba9bf108ffec53 files/digest-lcdtest-1.08 235
-RMD160 a5d9917e68da48a48a69920b66e7c54f69005399 files/digest-lcdtest-1.08 235
-SHA256 1f6e0b6e3006903c3985df291f97a7757a047b4df638015c16ea353a7421218a files/digest-lcdtest-1.08 235
+MD5 7df8910bcd6424c79aba9bf108ffec53 files/digest-lcdtest-1.08-r1 235
+RMD160 a5d9917e68da48a48a69920b66e7c54f69005399 files/digest-lcdtest-1.08-r1 235
+SHA256 1f6e0b6e3006903c3985df291f97a7757a047b4df638015c16ea353a7421218a files/digest-lcdtest-1.08-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHL7op5vW4rUFj5oRAkG/AJ0addji58i87ND/8YTCM/hsImt+BwCeMP0E
-5JdjZ1YXDSMIujtYjC41w0k=
-=ZeQR
+iD8DBQFHHRhmp5vW4rUFj5oRAqWqAJ9yz3uub63SVzLpswV1nKnx31rjkQCgidpZ
++jUtfjI8hgmKJHG8PrTTVFg=
+=y0zn
 -----END PGP SIGNATURE-----
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
-}