Drop support for old versions (not working with modular-x), fix bug bug #151289 for current stable

Some ebuild cleanup for 0.9.11


svn path=/trunk/; revision=49

8 files changed, 58 insertions, 158 deletions

diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index e6c3056..830d33f 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,24 +1,17 @@
+AUX lcd4linux-0.9.11-modular-x.patch 511 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 SHA1 62b23be4a3a9c84709b1f5e35fa382cab17bc5e5 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10
+MD5 6ede29698c02eb80e3d9561bfa951681 files/lcd4linux-0.9.11-modular-x.patch 511
+RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 files/lcd4linux-0.9.11-modular-x.patch 511
+SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10 files/lcd4linux-0.9.11-modular-x.patch 511
 DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909
-DIST lcd4linux-0.9.10-cf634.diff 374
-DIST lcd4linux-0.9.10.tar.gz 168125
-DIST lcd4linux-0.9.11.tar.gz 218557
-DIST lcd4linux-0.9.9.tar.gz 161096
+DIST lcd4linux-0.9.11.tar.gz 218557 RMD160 55257d7c5951938ce7a1b878935139e436514ef0 SHA1 9dec2d2b8d236adba59d531f1167fab295f0c1b0 SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627
 EBUILD lcd4linux-0.10.0.ebuild 2787 RMD160 a7d404764a9508d6115e8bd07bec74217e8cc92e SHA1 c4a74d81cceaa6f445d8c4723fa08a1f7b26f3fa SHA256 c2d09c83b0419f7f2490f596b40e98d338518f493773c64b93edb8102954e84d
 MD5 b076982a618670f10339085615f0e946 lcd4linux-0.10.0.ebuild 2787
 RMD160 a7d404764a9508d6115e8bd07bec74217e8cc92e lcd4linux-0.10.0.ebuild 2787
 SHA256 c2d09c83b0419f7f2490f596b40e98d338518f493773c64b93edb8102954e84d lcd4linux-0.10.0.ebuild 2787
-EBUILD lcd4linux-0.9.10.ebuild 1547 RMD160 87a4112ab69308183347c282b59c34dcb133727c SHA1 73d857a9120d54ecd205fced7c352b576aebf7c0 SHA256 1514fdd8a21611bd52a961c60cdfd3fa644752bbc9cb5fb600b5d7c0e5462cd4
-MD5 71f3012032f36f614511846ef6539074 lcd4linux-0.9.10.ebuild 1547
-RMD160 87a4112ab69308183347c282b59c34dcb133727c lcd4linux-0.9.10.ebuild 1547
-SHA256 1514fdd8a21611bd52a961c60cdfd3fa644752bbc9cb5fb600b5d7c0e5462cd4 lcd4linux-0.9.10.ebuild 1547
-EBUILD lcd4linux-0.9.11.ebuild 1402 RMD160 78ec3d3ef0756b67aaeb50d63584a00c2305cd91 SHA1 ea0b66569f5944f20e5d7018cdd761fd51b6fd22 SHA256 bb8f5b110080e3a67b251b62e40264388693abd229ab3a2c4f6dd6910fd3b77c
-MD5 386afb21661b822231db0bdc4a303800 lcd4linux-0.9.11.ebuild 1402
-RMD160 78ec3d3ef0756b67aaeb50d63584a00c2305cd91 lcd4linux-0.9.11.ebuild 1402
-SHA256 bb8f5b110080e3a67b251b62e40264388693abd229ab3a2c4f6dd6910fd3b77c lcd4linux-0.9.11.ebuild 1402
-EBUILD lcd4linux-0.9.9.ebuild 1407 RMD160 39b58d39306e3e0b03d3d8a1b6863835373fc244 SHA1 657b152394e88f2c56eb7285704841361fe262ea SHA256 839a9bca35e8f5bfcb09ce41b415de268ba8db2cac4eb653484a5c8f16c06710
-MD5 c9a19619c50adf559e95c14556c13a40 lcd4linux-0.9.9.ebuild 1407
-RMD160 39b58d39306e3e0b03d3d8a1b6863835373fc244 lcd4linux-0.9.9.ebuild 1407
-SHA256 839a9bca35e8f5bfcb09ce41b415de268ba8db2cac4eb653484a5c8f16c06710 lcd4linux-0.9.9.ebuild 1407
+EBUILD lcd4linux-0.9.11.ebuild 1460 RMD160 07856aa53526f71aea1bc1144f94c5d29fb3ff49 SHA1 3bffb3e07b53165ef44fb40ffe9273a3101a64a5 SHA256 0c06225e971954403215dc9a1edc788d152205c439eadb71f37e540c2c9506b6
+MD5 75b919a3b52ebc8eae7731d5c141bbd3 lcd4linux-0.9.11.ebuild 1460
+RMD160 07856aa53526f71aea1bc1144f94c5d29fb3ff49 lcd4linux-0.9.11.ebuild 1460
+SHA256 0c06225e971954403215dc9a1edc788d152205c439eadb71f37e540c2c9506b6 lcd4linux-0.9.11.ebuild 1460
 MISC ChangeLog 2582 RMD160 40c368fdc64459214757c76ae4b627ef77e256ff SHA1 3948ea0689f1711eca3b9b64958ad3e9ff6683b7 SHA256 8f8ba70415337ea307cade19b8badb969c316709af51b20422eaf1978fdad837
 MD5 bd8bab01ed9bab10ef05174299a5eac6 ChangeLog 2582
 RMD160 40c368fdc64459214757c76ae4b627ef77e256ff ChangeLog 2582
@@ -26,12 +19,6 @@ SHA256 8f8ba70415337ea307cade19b8badb969c316709af51b20422eaf1978fdad837 ChangeLo
 MD5 0b746369033d8d0fffea2ec67f83ad4e files/digest-lcd4linux-0.10.0 250
 RMD160 018c8b34815a32a9902122a5e67b6acbc2e3e41a files/digest-lcd4linux-0.10.0 250
 SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/digest-lcd4linux-0.10.0 250
-MD5 f197056607042f185af2a6d50a35d996 files/digest-lcd4linux-0.9.10 137
-RMD160 651ca3e12c2879ee943e6c702257bb533b2b3bdb files/digest-lcd4linux-0.9.10 137
-SHA256 ecdaf5ae619f4e161f67b582444f1184a5f651fdcc730c65029191ac49bce770 files/digest-lcd4linux-0.9.10 137
-MD5 4c2c84ffe062afa20fb8f4ac16c4b4db files/digest-lcd4linux-0.9.11 68
-RMD160 10b19651a771ede7502219f8064a28b08b1e7575 files/digest-lcd4linux-0.9.11 68
-SHA256 d93ae146107bc783b115c7831da4bd7363e97c0d696460720d27a6810bbfb4be files/digest-lcd4linux-0.9.11 68
-MD5 5ed6638feaed61ef4b7f35f2c7c7f5c8 files/digest-lcd4linux-0.9.9 67
-RMD160 28cd30c24b6fb346c559d4a8896069be96845bfb files/digest-lcd4linux-0.9.9 67
-SHA256 7038839d95c7e4ad20d18e4f0e5d7dfb56259a1db1ca663bcae5d49a382bb955 files/digest-lcd4linux-0.9.9 67
+MD5 13ed5c0953ded79c7f0bec71639165d3 files/digest-lcd4linux-0.9.11 250
+RMD160 eda6875e2399a5a0dbd6e524ad54dc9eff4d64a5 files/digest-lcd4linux-0.9.11 250
+SHA256 35fd2911bf35973aa9b05f59c3b40d7637d4d89eb9ce4630fab451816619ce9d files/digest-lcd4linux-0.9.11 250
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.10 b/app-misc/lcd4linux/files/digest-lcd4linux-0.9.10
deleted file mode 100644
index b1e5eb8..0000000
--- a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1de6c447d0268af5b02735dfb403f114 lcd4linux-0.9.10.tar.gz 168125
-MD5 61cfc4ef1ee94fe25085d32e004132de lcd4linux-0.9.10-cf634.diff 374
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11 b/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11
index 4ceef78..835ec66 100644
--- a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11
+++ b/app-misc/lcd4linux/files/digest-lcd4linux-0.9.11
@@ -1 +1,3 @@
 MD5 fabbc58e9118570c1f57ae90743e4859 lcd4linux-0.9.11.tar.gz 218557
+RMD160 55257d7c5951938ce7a1b878935139e436514ef0 lcd4linux-0.9.11.tar.gz 218557
+SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627 lcd4linux-0.9.11.tar.gz 218557
diff --git a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.9 b/app-misc/lcd4linux/files/digest-lcd4linux-0.9.9
deleted file mode 100644
index b2d30ca..0000000
--- a/app-misc/lcd4linux/files/digest-lcd4linux-0.9.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c18b11d2bcfe7f096bf62c5ebf25b543 lcd4linux-0.9.9.tar.gz 161096
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.9.11-modular-x.patch b/app-misc/lcd4linux/files/lcd4linux-0.9.11-modular-x.patch
new file mode 100644
index 0000000..dc76515
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.9.11-modular-x.patch
@@ -0,0 +1,15 @@
+--- configure.in.orig	2006-10-23 02:23:15.000000000 +0200
++++ configure.in	2006-10-23 02:24:45.000000000 +0200
+@@ -228,7 +228,11 @@
+       AC_MSG_ERROR(X11 headers or libraries not available: X11 driver disabled)
+    else
+       DRIVERS="$DRIVERS XWindow.o"
+-      DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
++      if test "x$ac_x_libraries" = "x"; then
++         DRVLIBS="$DRVLIBS -lX11"
++      else
++         DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
++      fi
+       AC_DEFINE(WITH_X11,1,[junk])
+    fi
+ fi
diff --git a/app-misc/lcd4linux/lcd4linux-0.9.10.ebuild b/app-misc/lcd4linux/lcd4linux-0.9.10.ebuild
deleted file mode 100644
index 3e0b824..0000000
--- a/app-misc/lcd4linux/lcd4linux-0.9.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.10.ebuild,v 1.8 2005/01/25 15:27:45 greg_g Exp $
-
-inherit eutils
-
-DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window"
-HOMEPAGE="http://lcd4linux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz
-	http://branched.modestolan.com/${P}-cf634.diff"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="kde pda png X usb"
-
-DEPEND="png? ( media-libs/libpng
-	sys-libs/zlib
-	media-libs/gd )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${DISTDIR}/${P}-cf634.diff
-}
-
-src_compile() {
-	local myconf
-	use png || myconf=",!PNG"
-	use pda || myconf="${myconf},!PalmPilot"
-	use X || myconf="${myconf},!X11"
-	use usb || myconf="${myconf},!USBLCD"
-	econf \
-		--sysconfdir=/etc/lcd4linux \
-		--with-drivers="all${myconf},!PNG" \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	CONFIG_PROTECT="${CONFIG_PROTECT} /etc/lcd4linux"
-	einstall || die
-
-	insinto /etc/lcd4linux
-	cp lcd4linux.conf.sample lcd4linux.conf
-	insopts -o root -g root -m 0600
-	doins lcd4linux.conf
-	dodoc README* NEWS INSTALL TODO CREDITS FAQ
-	dodoc lcd4linux.conf.sample lcd4linux.kdelnk lcd4linux.xpm
-
-	if use kde ; then
-		insinto /etc/lcd4linux
-		insopts -o root -g root -m 0600
-		doins lcd4kde.conf
-		insinto /usr/share/applnk/apps/System
-		doins lcd4linux.kdelnk
-		insinto /usr/share/pixmaps
-		doins lcd4linux.xpm
-		touch ${D}/etc/lcd4linux/lcd4X11.conf
-	fi
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
index 73d9341..9ac0c40 100644
--- a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild,v 1.9 2005/01/25 15:27:45 greg_g Exp $
+# $Header: $
 
+inherit autotools eutils
 
-DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window"
+DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
 HOMEPAGE="http://lcd4linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz"
 
@@ -12,16 +13,30 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="kde pda png X usb"
 
-DEPEND="png? ( media-libs/libpng
-	sys-libs/zlib
-	media-libs/gd )"
+RDEPEND="
+	sys-libs/ncurses
+	x11-libs/libX11
+	png? ( media-libs/gd )
+	"
+
+DEPEND="${DEPEND}
+	x11-libs/libXt
+	"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-modular-x.patch"
+	eautoreconf
+}
 
 src_compile() {
 	local myconf
 
 	use png || myconf=",!PNG"
 	use pda || myconf="${myconf},!PalmPilot"
-	use X || myconf="${myconf},!X11"
+	use X   || myconf="${myconf},!X11"
 	use usb || myconf="${myconf},!USBLCD"
 
 	econf \
@@ -35,20 +50,20 @@ src_install() {
 	CONFIG_PROTECT="${CONFIG_PROTECT} /etc/lcd4linux"
 	einstall
 
-	insinto /etc/lcd4linux
-	cp lcd4linux.conf.sample lcd4linux.conf
 	insopts -o root -g root -m 0600
-	doins lcd4linux.conf
-	dodoc README* NEWS INSTALL TODO CREDITS FAQ
+	insinto ${ROOT}etc/lcd4linux
+	newins lcd4linux.conf.sample lcd4linux.conf
+
+	dodoc README* NEWS TODO CREDITS FAQ
 	dodoc lcd4linux.conf.sample lcd4linux.kdelnk lcd4linux.xpm
 
 	if use kde ; then
-		insinto /etc/lcd4linux
+		insinto ${ROOT}etc/lcd4linux
 		insopts -o root -g root -m 0600
 		doins lcd4kde.conf
-		insinto /usr/share/applnk/apps/System
+		insinto ${ROOT}usr/share/applnk/System
 		doins lcd4linux.kdelnk
-		insinto /usr/share/pixmaps
+		insinto ${ROOT}usr/share/pixmaps
 		doins lcd4linux.xpm
 		touch ${D}/etc/lcd4linux/lcd4X11.conf
 	fi
diff --git a/app-misc/lcd4linux/lcd4linux-0.9.9.ebuild b/app-misc/lcd4linux/lcd4linux-0.9.9.ebuild
deleted file mode 100644
index b768ce7..0000000
--- a/app-misc/lcd4linux/lcd4linux-0.9.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.9.ebuild,v 1.11 2005/01/25 15:27:45 greg_g Exp $
-
-DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window"
-HOMEPAGE="http://lcd4linux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="kde pda png X usb"
-
-DEPEND="png? ( media-libs/libpng
-	sys-libs/zlib
-	media-libs/gd )"
-
-src_compile() {
-	local myconf
-
-	use png || myconf=",!PNG"
-	use pda || myconf="${myconf},!PalmPilot"
-	use X || myconf="${myconf},!X11"
-	use usb || myconf="${myconf},!USBLCD"
-
-	econf \
-		--sysconfdir=/etc/lcd4linux \
-		--with-drivers="all${myconf},!PNG" || die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	CONFIG_PROTECT="${CONFIG_PROTECT} /etc/lcd4linux"
-	einstall
-
-	insinto /etc/lcd4linux
-	cp lcd4linux.conf.sample lcd4linux.conf
-	insopts -o root -g root -m 0600
-	doins lcd4linux.conf
-	dodoc README* NEWS INSTALL TODO CREDITS FAQ
-	dodoc lcd4linux.conf.sample lcd4linux.kdelnk lcd4linux.xpm
-
-	if use kde ; then
-		insinto /etc/lcd4linux
-		insopts -o root -g root -m 0600
-		doins lcd4kde.conf
-		insinto /usr/share/applnk/apps/System
-		doins lcd4linux.kdelnk
-		insinto /usr/share/pixmaps
-		doins lcd4linux.xpm
-		touch ${D}/etc/lcd4linux/lcd4X11.conf
-	fi
-}