Version bump, ~amd64 thanks to malc for testing

(Portage version: 2.1_pre4-r1)

4 files changed, 343 insertions, 17 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index d16b7d6737dc..8d969387a5b5 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fcdsl
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.21 2005/10/17 16:14:57 mrness Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.22 2006/02/22 21:43:20 genstef Exp $
+
+*fcdsl-2.6.37 (22 Feb 2006)
+
+  22 Feb 2006; Stefan Schweizer <genstef@gentoo.org> +fcdsl-2.6.37.ebuild:
+  Version bump, ~amd64 thanks to malc for testing
 
   17 Oct 2005; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r5.ebuild,
   fcdsl-2.6.30.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 5866f7bc90ed..b5a37af2e3a2 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,19 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 148f263dda7f3624f16da4775621994b fcdsl-2.6.30.ebuild 8516
+MD5 12693ca319a414abbdb1080dcd75111c ChangeLog 4140
+RMD160 9686dceb1c566e156df8ecc31ee8ecc2f7d122fe ChangeLog 4140
+SHA256 a60f131c4e5a96906f5ef6e84ddad8e089f46ad48e339f9b0d0498581db48ac0 ChangeLog 4140
 MD5 0982f7b0c52fbeb78c2639512a38d4f3 fcdsl-2.6.20.7-r5.ebuild 7877
-MD5 494720083d81840ad1f38e74ae407707 ChangeLog 3985
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
-MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
+RMD160 c1c98a030a614c9155a7430d9422f7dd50917473 fcdsl-2.6.20.7-r5.ebuild 7877
+SHA256 9c2ff34ebc76ee11e62b7f505bafe3f6dacc69607bc024488aed23fc660bc3fb fcdsl-2.6.20.7-r5.ebuild 7877
+MD5 148f263dda7f3624f16da4775621994b fcdsl-2.6.30.ebuild 8516
+RMD160 45a7314547a93edc491a202dfe1e931bc97a5526 fcdsl-2.6.30.ebuild 8516
+SHA256 859ea26741d55b4bce67761da8dad516808a8dccff3934244a7f4b1cc7d4ec1f fcdsl-2.6.30.ebuild 8516
+MD5 f707120f0fcaa41cbda51b74be563b6a fcdsl-2.6.37.ebuild 7988
+RMD160 2d6068a68354446b4d3fd679644c836d2bf80a5c fcdsl-2.6.37.ebuild 7988
+SHA256 f5cc17c5ff56c142c80c827f730b91f0532b9d850e03867968619ec421511363 fcdsl-2.6.37.ebuild 7988
 MD5 7d0d40b4547c891577925915b046cffc files/digest-fcdsl-2.6.20.7-r5 381
+RMD160 a06205a89ef0bc2a41c2a0771f04d5952af41d75 files/digest-fcdsl-2.6.20.7-r5 381
+SHA256 74a1afafe4f14438cf1901ed76bd0cac3afe05cf944b917c59efa5e7f6a8d2da files/digest-fcdsl-2.6.20.7-r5 381
 MD5 dab3e4adbbff865b35f3dce666fc454a files/digest-fcdsl-2.6.30 525
+RMD160 dcb6d62bbcc6e3331b50e256d254eeb282a1f76f files/digest-fcdsl-2.6.30 525
+SHA256 e7fd3baa3ff27ae3b504986d9f62fe83d916e9fe85892a1c48db82dfa3ae7f8f files/digest-fcdsl-2.6.30 525
+MD5 e41c4dcf268ff09e5857f2c60e586cbc files/digest-fcdsl-2.6.37 1042
+RMD160 d492ceb309343268216cdad8a1f78731fb32e0ba files/digest-fcdsl-2.6.37 1042
+SHA256 9a82e617c81de5fd9ccdffa972127d6f4a4cbc6b1dbba90df5f6d567ec720c3d files/digest-fcdsl-2.6.37 1042
+MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
+RMD160 cbb6808cc70d914352153ffa38971f331977c432 files/fcdsl.diff 4636
+SHA256 6e30c6dd4f5e00f519b738c704171be15c7d8721fdce18a801b54fc62be9bb8c files/fcdsl.diff 4636
 MD5 4d073842f89f61ce68ae5ee7ac100d70 files/fcdsl2.diff 1867
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDU84hNSP4Vda7IdsRAicpAJ44hJZeQLvrsL0tomTwCLEJXC9pUACfW8zj
-f10MEItCCzRuP8GBBJQRMXg=
-=bdN2
------END PGP SIGNATURE-----
+RMD160 a18821ffd68c63624e7e3b51b7306ba4a362f937 files/fcdsl2.diff 1867
+SHA256 1a9b844401810f124081da49432be11f1e7b2536cba6dbedb1b8a5d500b146f9 files/fcdsl2.diff 1867
+MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
+RMD160 3025a672f4d21d2aa0456c224ddc7c97f1a18b44 files/fcdslsl.diff 1896
+SHA256 461cd3841d888275fe823f185c4cd8caafdae2e772ecac7b259a323e09b0e5d3 files/fcdslsl.diff 1896
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
+SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
new file mode 100644
index 000000000000..f0c0b4ef3f4c
--- /dev/null
+++ b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.1 2006/02/22 21:43:20 genstef Exp $
+
+inherit linux-mod eutils rpm
+
+DESCRIPTION="AVM FRITZ!Card DSL drivers for 2.6 kernel"
+HOMEPAGE="http://www.avm.de/"
+
+SRC_HEAD="ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Beta3-Extra/suse"
+SRC_URI="x86? ( ${SRC_HEAD}/i586/km_${P/2.6./2.6-}.i586.rpm
+		${SRC_HEAD}/i586/avm_${P/2.6./2.6-}.i586.rpm )
+	amd64? ( ${SRC_HEAD}/x86_64/km_${P/2.6./2.6-}.x86_64.rpm
+		${SRC_HEAD}/x86_64/avm_${P/2.6./2.6-}.x86_64.rpm )"
+
+LICENSE="LGPL-2"
+KEYWORDS="~x86 ~amd64 -*"
+IUSE="unicode"
+SLOT="0"
+S=${WORKDIR}
+
+RDEPEND=">=net-dialup/capi4k-utils-20040810"
+
+pkg_setup() {
+	use x86 && FCDSL_MODULES=("fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb" "fcdslusb2"
+		"fcdsl" "fcdslusba")
+	use amd64 && FCDSL_MODULES=("fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb" "fcdslusb2")
+	FCDSL_NAMES=("AVM FRITZ!Card DSL v2.0" "AVM FRITZ!Card DSL SL"
+		"AVM FRITZ!Card DSL USB" "AVM FRITZ!Card DSL SL USB" "AVM Fritz!Card DSL USB v2.0"
+		"AVM FRITZ!Card DSL" "AVM Fritz!Card DSL USB analog")
+	FCDSL_BUSTYPES=("pci" "pci" "usb" "usb" "usb" "pci" "usb")
+	FCDSL_IDS=("1244:2900" "1244:2700" "057c:2300" "057c:3500"
+		"057c:3600" "1131:5402" "057c:3000")
+	FCDSL_FIRMWARES=("fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm"
+		"fds2base.frm" "fdslbase.bin" "fdlabase.frm")
+
+	CONFIG_CHECK="ISDN_CAPI_CAPI20"
+	linux-mod_pkg_setup
+
+	MODULE_NAMES=""
+	#Check existence of user selected cards
+	if [ -n "${FCDSL_CARDS}" ] ; then
+		for USERCARD in ${FCDSL_CARDS} ; do
+			for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+				if [ "${USERCARD}" = "${FCDSL_MODULES[CARD]}" ]; then
+					MODULE_NAMES="${MODULE_NAMES}
+					${FCDSL_MODULES[CARD]}(net:${WORKDIR}/usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]})"
+					continue 2
+				fi
+			done
+			die "Driver for ${USERCARD} not present in ${P}"
+		done
+	else
+		einfo
+		einfo "You can control the modules which are built with the variable"
+		einfo "FCDSL_CARDS which should contain a blank separated list"
+		einfo "of a selection from the following cards:"
+		einfo "   ${FCDSL_MODULES[*]}"
+		for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+			MODULE_NAMES="${MODULE_NAMES} ${FCDSL_MODULES[CARD]}(net:${WORKDIR}/usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]})"
+		done
+	fi
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}"
+}
+
+src_unpack() {
+	use x86 && rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm
+	use amd64 && rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.x86_64.rpm
+
+	use x86 && rpm_unpack ${DISTDIR}/avm_${P/2.6./2.6-}.i586.rpm
+	use amd64 && rpm_unpack ${DISTDIR}/avm_${P/2.6./2.6-}.x86_64.rpm
+
+	mv usr/src/kernel-modules/fcdsl/src/src.fcdslusb1 \
+		usr/src/kernel-modules/fcdsl/src/src.fcdslusb
+
+	if use x86; then
+		for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+			cd usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]}
+			[ -f ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff ] && epatch ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff
+			cd ${S}
+		done
+	fi
+
+	# convert docs from latin1 to UTF-8
+	if use unicode; then
+		for i in usr/share/doc/packages/avm_fcdsl/compile-help-german.txt etc/drdsl/drdsl.ini; do
+			einfo "Converting '${i##*/}' to UTF-8"
+			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+		if [ -n "${FCDSL_CARDS}" ] ; then
+			INS=""
+			for USERCARD in ${FCDSL_CARDS} ; do
+				if [ "${USERCARD}" = "${FCDSL_MODULES[CARD]}" ]; then INS="1"; fi
+			done
+			if [ -z "${INS}" ]; then continue; fi
+		fi
+
+		insinto /lib/firmware/isdn
+		doins ${WORKDIR}/lib/firmware/isdn/${FCDSL_FIRMWARES[CARD]}
+	done
+
+	insinto /etc/drdsl
+	doins etc/drdsl/drdsl.ini
+	dosbin sbin/drdsl
+
+	cd usr/share/doc/packages/avm_fcdsl
+	dodoc *.txt
+	dohtml *.html *.jpg
+	docinto example
+	dodoc example/*
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo "The preferred way to setup your card is either /etc/capi.conf"
+	einfo "or hotplug, since USB-Cards are detected automatically."
+	einfo
+	einfo "If you want to setup your DSL card driver and create a peer file, please run:"
+	einfo "    etc-update"
+	einfo "    emerge --config '=${CATEGORY}/${PF}'"
+	einfo "    /etc/init.d/capi start"
+	einfo "    drdsl"
+	#ewarn
+	#ewarn "'drdsl' has now its own ebuild. Please emerge net-dialup/drdsl."
+	epause 10
+}
+
+#pkg-config functions
+
+detect_fcdsl_card() {
+	PCI_IDS=""
+	USB_IDS=""
+	if [ -d /sys/bus ]; then
+		if [ -d /sys/bus/pci/devices ]; then
+			cd /sys/bus/pci/devices
+			for PCI_DEVICE in *; do
+				vendor="$(< ${PCI_DEVICE}/vendor)"
+				device="$(< ${PCI_DEVICE}/device)"
+				PCI_IDS="${PCI_IDS}${vendor:2}:${device:2} "
+			done
+		fi
+		if [ -d /sys/bus/usb/devices ]; then
+			cd /sys/bus/usb/devices
+			for USB_DEVICE in [0-9]*; do
+				if [ -f ${USB_DEVICE}/idVendor ]; then
+					USB_IDS="${USB_IDS}$(< ${USB_DEVICE}/idVendor):$(< ${USB_DEVICE}/idProduct) "
+				fi
+			done
+		fi
+	fi
+
+	FCDSL_MODULE=""
+	for ((CARD=0; CARD < ${#FCDSL_IDS[*]}; CARD++)); do
+		BUS_IDS=""
+		if [ "${FCDSL_BUSTYPES[CARD]}" == "pci" ]; then
+			BUS_IDS="${PCI_IDS}"
+		else
+			BUS_IDS="${USB_IDS}"
+		fi
+		for BUS_ID in ${BUS_IDS}; do
+			if [ "${BUS_ID}" == "${FCDSL_IDS[CARD]}" ]; then
+				einfo "Found: ${FCDSL_NAMES[CARD]}"
+				FCDSL_FIRMWARE=${FCDSL_FIRMWARES[CARD]}
+				FCDSL_MODULE=${FCDSL_MODULES[CARD]}
+			fi
+		done
+	done
+	if [ "${FCDSL_MODULE}" == "" ]; then
+		ewarn "No AVM FRITZ!Card DSL found!"
+	fi
+}
+
+readpassword() {
+	VALUE_1=""
+	VALUE_2=""
+	while true; do
+		einfo "Enter your password:"
+		read -r -s VALUE_1
+		einfo "Retype your password:"
+		read -r -s VALUE_2
+		if [ "${VALUE_1}" == "" ]; then
+			echo
+			eerror "You entered a blank password. Please try again."
+			echo
+		else
+			if [ "${VALUE_1}" == "${VALUE_2}" ] ; then
+				break
+			else
+				echo
+				eerror "Your password entries do not match. Please try again."
+				echo
+			fi
+		fi
+	done
+	eval ${1}=${VALUE_1}
+
+	VALUE_1=""
+	VALUE_2=""
+	unset VALUE_1
+	unset VALUE_2
+}
+
+readvalue() {
+	VALUE=""
+	while true; do
+		einfo "${2}:"
+		read VALUE
+		if [ "${VALUE}" == "" ]; then
+			eerror "You entered a blank value. Please try again."
+			echo
+		else
+			break
+		fi
+	done
+	eval ${1}=${VALUE}
+
+	VALUE=""
+	unset VALUE
+}
+
+pkg_config() {
+	detect_fcdsl_card
+
+	if [ "${FCDSL_MODULE}" != "" ]; then
+		readvalue FCDSL_PROVIDER "Enter the name of your ISP"
+		if [ ! -e "/etc/ppp/peers/${FCDSL_PROVIDER}" ]; then
+			readvalue FCDSL_USER "Enter your user name"
+			if ! grep "${FCDSL_USER}" /etc/ppp/pap-secrets >/dev/null 2>&1; then
+				readpassword FCDSL_PASSWORD
+				echo '"'${FCDSL_USER}'" * "'${FCDSL_PASSWORD}'"' >>/etc/ppp/pap-secrets
+				unset FCDSL_PASSWORD
+				cat <<EOF >/etc/ppp/peers/${FCDSL_PROVIDER}
+connect ""
+ipcp-accept-remote
+ipcp-accept-local
+usepeerdns
+defaultroute
+user "${FCDSL_USER}"
+hide-password
+sync
+noauth
+lcp-echo-interval 5
+lcp-echo-failure 3
+lcp-max-configure 50
+lcp-max-terminate 2
+noccp
+noipx
+noproxyarp
+mru 1492
+mtu 1492
+linkname "${FCDSL_PROVIDER}"
+ipparam internet
+plugin capiplugin.so
+avmadsl
+:
+/dev/null
+EOF
+				echo
+				echo
+				echo
+				einfo "Now, you can start an ADSL connection with either"
+				einfo "    pon \"${FCDSL_PROVIDER}\""
+				einfo "or"
+				einfo "    pppd call \"${FCDSL_PROVIDER}\""
+			else
+				ewarn "User \"${FCDSL_USER}\" already exists in \"/etc/ppp/pap-secrets\"!"
+			fi
+		else
+			ewarn "Peer file \"/etc/ppp/peers/${FCDSL_PROVIDER}\" already exists!"
+		fi
+
+		#Uncomment correspondent lines in /etc/capi.conf & /etc/modules.d/fcdsl
+		if [ -f /etc/capi.conf ]; then
+			sed -i -e "s:^#${FCDSL_MODULE}:${FCDSL_MODULE}:" \
+				/etc/capi.conf >/dev/null 2>&1
+		fi
+		if [ -f /etc/modules.d/fcdsl ]; then
+			sed -i -e "s:^#options ${FCDSL_MODULE}:options ${FCDSL_MODULE}:" \
+				/etc/modules.d/fcdsl >/dev/null 2>&1
+		fi
+	else
+		ewarn "No AVM FRITZ!Card DSL found!"
+	fi
+	unset FCDSL_PROVIDER
+	unset FCDSL_USER
+}
diff --git a/net-dialup/fcdsl/files/digest-fcdsl-2.6.37 b/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
new file mode 100644
index 000000000000..1623b4ff6e5b
--- /dev/null
+++ b/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
@@ -0,0 +1,12 @@
+MD5 cdbb9f6bbaa4d44f0346ed81e089c202 avm_fcdsl-2.6-37.i586.rpm 1059204
+RMD160 3ab3bb6a8006167004c93c5348f07d4fc6fc2a96 avm_fcdsl-2.6-37.i586.rpm 1059204
+SHA256 6f3531eaa2583a50586d6f29c7f3a48cd16a507ea4d1cbc1ccb2e2d718396021 avm_fcdsl-2.6-37.i586.rpm 1059204
+MD5 0cceb1102af309056d00df7cc1a6a4d5 avm_fcdsl-2.6-37.x86_64.rpm 1064850
+RMD160 f0a76d19f0ed2221f872e42dbc38cba874d31137 avm_fcdsl-2.6-37.x86_64.rpm 1064850
+SHA256 b9498312286e7d3f8c3bd7ac202e7bd75245fd93dc9aa8f2c784ace90a955757 avm_fcdsl-2.6-37.x86_64.rpm 1064850
+MD5 c0613d5e257cb6f27fbaa9d197ad92d1 km_fcdsl-2.6-37.i586.rpm 2447670
+RMD160 a8372219af67b1a9d5c27d0c382f30b5c05a2e7e km_fcdsl-2.6-37.i586.rpm 2447670
+SHA256 8d767da36061ed4a0a9ee84b989d1810bcde0dab0474087b7e85e2bbc0751e4e km_fcdsl-2.6-37.i586.rpm 2447670
+MD5 db9062e2a9725814ca5f5098fe30d864 km_fcdsl-2.6-37.x86_64.rpm 1792580
+RMD160 8484ee301a6d603a7d9d0e1c97bc8d542e31833c km_fcdsl-2.6-37.x86_64.rpm 1792580
+SHA256 0412b03faa8b4f0e0b90e915e9492ae345fe7a797270b682de64b65ed9d20d33 km_fcdsl-2.6-37.x86_64.rpm 1792580