fix src_uri

4 files changed, 100 insertions, 138 deletions

diff --git a/net-misc/ltsp/ChangeLog b/net-misc/ltsp/ChangeLog
index 2e1fccb31fbc..570c18daa763 100644
--- a/net-misc/ltsp/ChangeLog
+++ b/net-misc/ltsp/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for net-misc/ltsp
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ChangeLog,v 1.5 2004/11/11 21:52:53 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ChangeLog,v 1.6 2004/12/05 11:17:14 lanius Exp $
 
-  11 Nov 2004; <heino@gentoo.org> -files/INSTALL.Gentoo, -files/Xaccess,
+  05 Dec 2004; lanius@gentoo.org ltsp-4.1-r1.ebuild:
+  fix handling of src_uri
+
+  11 Nov 2004; <lanius@gentoo.org> -files/INSTALL.Gentoo, -files/Xaccess,
   -files/Xsetup_workstation, -files/dhcpd.conf, -files/gdm.conf.pl,
   -files/install.sh, -files/kdmrc.pl, -files/ltsp.conf, -files/ltsp.gif,
   -files/tftp, -ltsp-3.0.9-r3.ebuild, -ltsp-4.0.ebuild:
diff --git a/net-misc/ltsp/Manifest b/net-misc/ltsp/Manifest
index a088e41a8b59..055f8d0a0e4e 100644
--- a/net-misc/ltsp/Manifest
+++ b/net-misc/ltsp/Manifest
@@ -1,7 +1,7 @@
-MD5 c57ba06eb5eb68031e430aa70e9c6452 ChangeLog 7161
-MD5 b2b668b08a0ad8a39b4ec7804cc946b0 ltsp-4.1-r1.ebuild 4663
+MD5 19d427423a968497e451e8bbe587136f ltsp-4.1-r1.ebuild 5300
+MD5 df6f9858ac9ba4d5a4ea76347bd20d27 ChangeLog 7242
 MD5 8470ac6202a79e428be0ed6867af12e8 metadata.xml 574
-MD5 13693bcf540d07a5f3a5fe4d6c7839cb files/digest-ltsp-4.1-r1 4324
-MD5 98c1e1d5fd02a42ec01348e7525e8108 files/eb-5.0.9-3c905c-tpo.lzpxe 17191
 MD5 0f37dcb7969240b88c680e0569385e2d files/eb-5.0.9-eepro100.lzpxe 16426
+MD5 e54bcb2c2c658558ede4b99c5d1a9a82 files/digest-ltsp-4.1-r1 4466
+MD5 98c1e1d5fd02a42ec01348e7525e8108 files/eb-5.0.9-3c905c-tpo.lzpxe 17191
 MD5 b716ae3544e8ac3e53f315a1e95f27a0 files/eb-5.0.9-rtl8139.lzpxe 16054
diff --git a/net-misc/ltsp/files/digest-ltsp-4.1-r1 b/net-misc/ltsp/files/digest-ltsp-4.1-r1
index c3a2aa366f0d..5959b3abadf9 100644
--- a/net-misc/ltsp/files/digest-ltsp-4.1-r1
+++ b/net-misc/ltsp/files/digest-ltsp-4.1-r1
@@ -37,6 +37,8 @@ MD5 ad662a97cda3389b2b1a4440977aa5bb ltsp-aumix-1.0-0-i386.tgz 48345
 MD5 13e79b438885aa790bbb7195563df3e5 ltsp-freetype-1.0-0-i386.tgz 586299
 MD5 fb79db426a2f9f6888430c3c309aa55c ltsp-kernel-1.4-0-i386.tgz 3874772
 MD5 3d4861ab2bd0f8c7819ef9a562286ed3 ltsp-modules-1.4-0-i386.tgz 3923245
+MD5 51a1f889b78fde496e2f1a07afcd08b6 ltsp-utils-0.9.tgz 40575
+MD5 0af5b6acee0f558c46621214cfbbda35 ltsp-snmpd-1-0-i386.tgz 4005591
 MD5 435d486670bcb254616dfa5a607f8e9e ltsp-gdb-1.0-0-i386.tgz 1604176
 MD5 b3a98509650f587194a1a02ff2c02615 ltsp-strace-1.0-0-i386.tgz 360028
 MD5 45afcb2172955f0a7515ee904c72ae8f ltsp-x-core-1.2-0-i386.tgz 18718396
@@ -55,6 +57,6 @@ MD5 133acac5836e2f1d7fb6aeff0eb6bf6a ltsp-x336_S3_S3V-1.0-0-i386.tgz 2078825
 MD5 e082f4d298a4f135e6db21bb970d95ce ltsp-x336_SVGA-1.0-0-i386.tgz 1509363
 MD5 71f5167a49ead5eee5371926c5c2829f ltsp-x336_VGA16-1.0-0-i386.tgz 891345
 MD5 04578a927b90c27c4b88c5248d660f0c ltsp-x336_W32-1.0-0-i386.tgz 818829
+MD5 693f1302ff1122ebda4de9b90652492b ltsp-audiofile-1.0-0-i386.tgz 70173
 MD5 2e39198e18c4ce1e48636369cc86151f ltsp-esd-1.0-0-i386.tgz 198156
 MD5 a8c6a26ce64a987dda05928ecb93227f ltsp_nasd-1.1-0-i386.tgz 644481
-MD5 51a1f889b78fde496e2f1a07afcd08b6 ltsp-utils-0.9.tgz 40575
diff --git a/net-misc/ltsp/ltsp-4.1-r1.ebuild b/net-misc/ltsp/ltsp-4.1-r1.ebuild
index 725ac327377c..a3eb32786c38 100644
--- a/net-misc/ltsp/ltsp-4.1-r1.ebuild
+++ b/net-misc/ltsp/ltsp-4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ltsp-4.1-r1.ebuild,v 1.3 2004/09/28 05:15:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ltsp-4.1-r1.ebuild,v 1.4 2004/12/05 11:17:14 lanius Exp $
 
 IUSE="X debug nas esd audiofile snmp"
 
@@ -21,150 +21,108 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-S=${WORKDIR}/ltsp
+SRC_URI="
+http://www.ltsp.org/ltsp-4.1/ltsp-ltsptree-1.7-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-glibc-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-sysvinit-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-popt-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-bash-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-busybox-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-devfsd-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-getltscfg-1.2-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-libgcc_s-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-haltsys-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-e2fsprogs-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-startsess-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-lp_server-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ltspinfod-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-modutils-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ncurses-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-open-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-prep_swap-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-zlib-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-libpng-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-pci_scan-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-pam-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ssh-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-net-tools-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-xinetd-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ypbind-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-tcp_wrappers-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-portmap-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-rdesktop-1.3-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-libvncserver-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-localdev-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-openssl-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-samba-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-util-linux-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-vidlist-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-aumix-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-freetype-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-kernel-1.4-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-modules-1.4-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-utils-0.9.tgz
+
+snmp? (
+http://www.ltsp.org/ltsp-4.1/http://www.ltsp.org/ltsp-4.1/ltsp-snmpd-1-0-i386.tgz )
+
+debug? (
+http://www.ltsp.org/ltsp-4.1/ltsp-gdb-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-strace-1.0-0-i386.tgz )
+
+X? (
+http://www.ltsp.org/ltsp-4.1/ltsp-x-core-1.2-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x-fonts-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x-fonts-100dpi-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_3DLabs-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_8514-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_AGX-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_I128-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mach32-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mach64-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mach8-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mono-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_P9000-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_S3_S3V-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_SVGA-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_VGA16-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_W32-1.0-0-i386.tgz )
+
+audiofile? (
+http://www.ltsp.org/ltsp-4.1/ltsp-audiofile-1.0-0-i386.tgz )
+
+esd? (
+http://www.ltsp.org/ltsp-4.1/ltsp-esd-1.0-0-i386.tgz )
+
+nas? (
+http://www.ltsp.org/ltsp-4.1/ltsp_nasd-1.1-0-i386.tgz )"
 
-LTSP_CORE="ltsp-ltsptree-1.7-0-i386.tgz
-ltsp-glibc-1.0-0-i386.tgz
-ltsp-sysvinit-1.0-0-i386.tgz
-ltsp-popt-1.1-0-i386.tgz
-ltsp-bash-1.0-0-i386.tgz
-ltsp-busybox-1.0-0-i386.tgz
-ltsp-devfsd-1.0-0-i386.tgz
-ltsp-getltscfg-1.2-0-i386.tgz
-ltsp-libgcc_s-1.0-0-i386.tgz
-ltsp-haltsys-1.0-0-i386.tgz
-ltsp-e2fsprogs-1.1-0-i386.tgz
-ltsp-startsess-1.1-0-i386.tgz
-ltsp-lp_server-1.1-0-i386.tgz
-ltsp-ltspinfod-1.1-0-i386.tgz
-ltsp-modutils-1.0-0-i386.tgz
-ltsp-ncurses-1.0-0-i386.tgz
-ltsp-open-1.1-0-i386.tgz
-ltsp-prep_swap-1.0-0-i386.tgz
-ltsp-zlib-1.0-0-i386.tgz
-ltsp-libpng-1.0-0-i386.tgz
-ltsp-pci_scan-1.0-0-i386.tgz
-ltsp-pam-1.0-0-i386.tgz
-ltsp-ssh-1.0-0-i386.tgz
-ltsp-net-tools-1.0-0-i386.tgz
-ltsp-xinetd-1.0-0-i386.tgz
-ltsp-ypbind-1.0-0-i386.tgz
-ltsp-tcp_wrappers-1.0-0-i386.tgz
-ltsp-portmap-1.0-0-i386.tgz
-ltsp-rdesktop-1.3-0-i386.tgz
-ltsp-libvncserver-1.0-0-i386.tgz
-ltsp-localdev-1.1-0-i386.tgz
-ltsp-openssl-1.0-0-i386.tgz
-ltsp-samba-1.0-0-i386.tgz
-ltsp-util-linux-1.0-0-i386.tgz
-ltsp-vidlist-1.1-0-i386.tgz
-ltsp-aumix-1.0-0-i386.tgz
-ltsp-freetype-1.0-0-i386.tgz"
-
-use snmp && LTSP_CORE="${LTSP_CORE} ltsp-snmpd-1-0-i386.tgz"
-
-LTSP_DEBUG="ltsp-gdb-1.0-0-i386.tgz
-ltsp-strace-1.0-0-i386.tgz"
-
-LTSP_X="ltsp-x-core-1.2-0-i386.tgz
-ltsp-x-fonts-1.0-0-i386.tgz
-ltsp-x-fonts-100dpi-1.0-0-i386.tgz
-ltsp-x336_3DLabs-1.0-0-i386.tgz
-ltsp-x336_8514-1.0-0-i386.tgz
-ltsp-x336_AGX-1.0-0-i386.tgz
-ltsp-x336_I128-1.0-0-i386.tgz
-ltsp-x336_Mach32-1.0-0-i386.tgz
-ltsp-x336_Mach64-1.0-0-i386.tgz
-ltsp-x336_Mach8-1.0-0-i386.tgz
-ltsp-x336_Mono-1.0-0-i386.tgz
-ltsp-x336_P9000-1.0-0-i386.tgz
-ltsp-x336_S3_S3V-1.0-0-i386.tgz
-ltsp-x336_SVGA-1.0-0-i386.tgz
-ltsp-x336_VGA16-1.0-0-i386.tgz
-ltsp-x336_W32-1.0-0-i386.tgz"
-
-LTSP_STUFF="ltsp-kernel-1.4-0-i386.tgz
-ltsp-modules-1.4-0-i386.tgz"
-
-LTSP_UTILS="ltsp-utils-0.9.tgz"
+S=${WORKDIR}/ltsp
 
 KERNEL_VERSION="2.4.26-ltsp-2"
 
-use audiofile && LTSP_SOUND="${LTSP_SOUND} ltsp-audiofile-1.0-0-i386.tgz"
-use esd && LTSP_SOUND="${LTSP_SOUND} ltsp-esd-1.0-0-i386.tgz"
-use nas && LTSP_SOUND="${LTSP_SOUND} ltsp_nasd-1.1-0-i386.tgz"
-
-for FILE in ${LTSP_CORE} ${LTSP_STUFF}
-do
-	SRC_URI="${SRC_URI} http://www.ltsp.org/ltsp-4.1/${FILE}"
-done
-
-for FILE in ${LTSP_DEBUG}
-do
-	SRC_URI="${SRC_URI} debug? ( http://www.ltsp.org/ltsp-4.1/${FILE} )"
-done
-
-for FILE in ${LTSP_X}
-do
-	SRC_URI="${SRC_URI} X? ( http://www.ltsp.org/ltsp-4.1/${FILE} )"
-done
-
-for FILE in ${LTSP_SOUND}
-do
-	SRC_URI="${SRC_URI} http://www.ltsp.org/ltsp-4.1/${FILE}"
-done
-
-SRC_URI="${SRC_URI} mirror://sourceforge/ltsp/${LTSP_UTILS}"
-
-
 src_unpack() {
 	# nothing to unpack
 	mkdir ltsp
 	cd ltsp
 
-	for FILE in ${LTSP_STUFF} ${LTSP_UTILS}
-	do
-		tar -xzf ${DISTDIR}/${FILE}
-	done
+	unpack ltsp-utils-0.9.tgz
+	unpack ltsp-kernel-1.4-0-i386.tgz
+	unpack ltsp-modules-1.4-0-i386.tgz
 }
 
 src_install() {
-	# now unpack the files
-	# first the core stuff
+	# core packages
+	MY_A=${A/ltsp-utils-0.9.tgz/}
+	MY_A=${MY_A/ltsp-kernel-1.4-0-i386.tgz/}
+	MY_A=${MY_A/ltsp-modules-1.4-0-i386.tgz/}
+
 	dodir /opt/ltsp-${PV}
-	echo "Installing core packages..."
-	for FILE in ${LTSP_CORE}
-	do
-		tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-	done
-
-	# debug stuff
-	if use debug ; then
-		echo "Installing debug packages..."
-		for FILE in ${LTSP_DEBUG}
-		do
-			tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-		done
-	fi
-
-	# X stuff
-	if use X ; then
-		echo "Installing X packages..."
-		for FILE in ${LTSP_X}
-		do
-			tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-		done
-	fi
-
-	# Sound Stuff stuff
-	echo "Installing Sound packages..."
-	for FILE in ${LTSP_SOUND}
-	do
-		tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-	done
+	cd ${D}/opt/ltsp-${PV}
+	unpack ${MY_A}
 
 	# kernel stuff
-	echo "Installing kernel packages..."
+	cd ${S}
 	find i386 -print | cpio -pmud --quiet ${D}/opt/ltsp-${PV} 2> /dev/null
 	insinto /tftpboot/lts
 	doins vmlinuz-${KERNEL_VERSION}
@@ -177,7 +135,6 @@ src_install() {
 
 	# config stuff
 	cd ltsp-utils
-	echo "Doing several other stuff..."
 	dosbin ltspcfg
 	dosbin ltspinfo
 	dosbin ltspadmin