removing old version (3.7_pre20050329), mark 3.7_pre20050626 stable on x86.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 39 insertions, 263 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index a000551039f2..4592eed81d4c 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/isdn4k-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.43 2005/07/02 09:34:30 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.44 2005/09/03 20:41:21 sbriesen Exp $
+
+  03 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org> metadata.xml,
+  -isdn4k-utils-3.7_pre20050329.ebuild, isdn4k-utils-3.7_pre20050626.ebuild:
+  removing old version (3.7_pre20050329), mark 3.7_pre20050626 stable on x86.
 
   02 Jul 2005; David Holm <dholm@gentoo.org>
   isdn4k-utils-3.7_pre20050626.ebuild:
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index e19f8c89dfdd..6dbcf87dd0fe 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,37 +1,35 @@
-MD5 104210d51574117ea2f57125d32e529f ChangeLog 11685
-MD5 bab835f739889e139f5acaf397d3d875 metadata.xml 215
+MD5 feee5c40e3619fe18a532086f1c13929 isdn4k-utils-3.7_pre20050626.ebuild 9401
+MD5 8298775c0cdaffb68452b882b04c8822 ChangeLog 11913
+MD5 41bb308eb7db7d75c04a60f8cfb73be3 metadata.xml 418
 MD5 5eeb7174364e6bddb64a87d746660f78 isdn4k-utils-3.6_pre20041219-r1.ebuild 7145
-MD5 7aeedfc11c7f11f8fc569a4cd2209aed isdn4k-utils-3.7_pre20050329.ebuild 7179
-MD5 509a445bb0572652f6587b0861d1b1e2 isdn4k-utils-3.7_pre20050626.ebuild 9399
+MD5 783ec6d5ce0fb40b310ae48e2de64348 files/isdnlog.confd 860
+MD5 ef3a37b1c8d2efcdb2d67b9fd8024a18 files/isdnlog.initd 2327
+MD5 83190cfc02f5adac34d8c9dbeaa5c6e3 files/ioptions 307
 MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219-r1 81
-MD5 a077770a61b46a7dbedad0213e5b14c3 files/auerswald.usermap 752
-MD5 01e75c203125d9976400683136a21687 files/config-3.7_pre20050329 2872
-MD5 3ffe8175b16f619144c182f11e3df55d files/digest-isdn4k-utils-3.7_pre20050329 81
-MD5 4f88056cd66f6651639f8c05a2f7070f files/hisax.conf 1317
+MD5 ea30a6607264a8e7b46e63591e849701 files/isdnlog.logrotated 422
 MD5 32928ad4aa70eb4764f57baae475543e files/hisax.initd 5892
-MD5 9c63ee81524f51cd1b9f419f00708195 files/hisax.usermap 188
-MD5 83190cfc02f5adac34d8c9dbeaa5c6e3 files/ioptions 307
 MD5 620a852c37aaa852e5089d22b3a5a14d files/isdn.blacklist 504
+MD5 21b03f01f94e8b006d19e7fe137e4648 files/options.ippp0 669
+MD5 9c63ee81524f51cd1b9f419f00708195 files/hisax.usermap 188
+MD5 521e30e785f269e397b134eaaedb9072 files/net.ippp0 2412
 MD5 99d61282daf6ef29dacefeaf666d3165 files/isdn.confd 568
 MD5 078c362ad4602156e0d4e1258d84c6a9 files/isdn.initd 2817
-MD5 783ec6d5ce0fb40b310ae48e2de64348 files/isdnlog.confd 860
-MD5 ef3a37b1c8d2efcdb2d67b9fd8024a18 files/isdnlog.initd 2327
-MD5 ea30a6607264a8e7b46e63591e849701 files/isdnlog.logrotated 422
-MD5 521e30e785f269e397b134eaaedb9072 files/net.ippp0 2412
-MD5 21b03f01f94e8b006d19e7fe137e4648 files/options.ippp0 669
+MD5 4f88056cd66f6651639f8c05a2f7070f files/hisax.conf 1317
+MD5 01e75c203125d9976400683136a21687 files/config-3.7_pre20050329 2872
 MD5 1485ac448762742431e425a8a9633caf files/config-3.7_pre20050626 2776
+MD5 a077770a61b46a7dbedad0213e5b14c3 files/auerswald.usermap 752
 MD5 0ec995fc0e6532f3934b3accad79f8cf files/digest-isdn4k-utils-3.7_pre20050626 81
-MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752
-MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693
-MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341
-MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817
-MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188
-MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323
-MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520
-MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500
-MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410
 MD5 f26cdb4ad4237c11b371a7dcb2d89d17 files/3.6_pre20041219/isdnlog.confd 415
 MD5 3f7c76a6d63f3677b81157bf9a7e84cd files/3.6_pre20041219/isdnlog.initd 1047
+MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323
 MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438
-MD5 4a1f7ca15a6ef5aa00648eb8ad43a9e1 files/3.6_pre20041219/net.ippp0 2428
+MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817
+MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520
 MD5 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685
+MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693
+MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188
+MD5 4a1f7ca15a6ef5aa00648eb8ad43a9e1 files/3.6_pre20041219/net.ippp0 2428
+MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500
+MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410
+MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341
+MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.7_pre20050329 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.7_pre20050329
deleted file mode 100644
index 03c7ee362540..000000000000
--- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.7_pre20050329
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc4ed55aecb2f612ef51d88a0345a56f isdn4k-utils-CVS-2005-03-29.tar.bz2 5579826
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050329.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050329.ebuild
deleted file mode 100644
index 0d3cefb5e6c1..000000000000
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050329.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050329.ebuild,v 1.1 2005/03/29 08:40:14 mrness Exp $
-
-inherit eutils linux-info
-
-MY_PV="${PV/*_pre/}"
-MY_P="${PN}-CVS-${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}"
-
-DESCRIPTION="ISDN4Linux Utils"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.isdn4linux.de/"
-
-KEYWORDS="~x86 ~amd64 ~alpha"
-LICENSE="GPL-2"
-IUSE="X unicode"
-SLOT="0"
-
-DEPEND="virtual/linux-sources
-	virtual/libc
-	sys-libs/ncurses
-	sys-libs/gdbm
-	dev-lang/tcl
-	X? ( virtual/x11 )"
-RDEPEND="${DEPEND}
-	virtual/modutils
-	net-dialup/ppp"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	CONFIG_CHECK="PPP"
-	linux-info_pkg_setup
-
-	# Get country code from I4L_CC variable
-	# default country: DE (Germany)
-	I4L_CC=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]")
-	[ -z "${I4L_CC}" ] && I4L_CC="DE"
-	I4L_CC_LOW=$(echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]")
-
-	# Get language from I4L_LANG variable ('de' or 'en')
-	I4L_LANG=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]")
-	if [ -z "${I4L_LANG}" ]; then
-		case "${I4L_CC}" in
-			AT|CH|DE)
-				I4L_LANG="DE"
-				;;
-			*)
-				I4L_LANG="EN"
-				;;
-		esac
-	fi
-	[ "${I4L_LANG}" = "DE" -o "${I4L_LANG}" = "EN" ] || I4L_LANG="EN"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix for 2.6 headers
-	find . -name "*.c" | \
-	xargs -r sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
-
-	# patch all Makefiles to use our CFLAGS
-	find . -name "Makefile*" | \
-	xargs -r sed -i -e "s:^CFLAGS\(.*\)-O[26]:CFLAGS\1${CFLAGS}:g" \
-					-e "s:^CFLAGS\(.*\)-g:CFLAGS\1${CFLAGS}:g" \
-					-e "s:^CFLAGS = -Wall$:CFLAGS = ${CFLAGS}:g" || die "sed failed"
-
-	# install our config
-	case "${I4L_CC}" in
-		DE|AT|NL|LU|CH)
-			# These countries are specially supported in the isdnlog source.
-			sed -e "s:^CONFIG_ISDN_LOG_XX=:CONFIG_ISDN_LOG_${I4L_CC}=:g" -e "s:^CONFIG_ISDN_LOG_CC=.*$:#:g" \
-				-e "s:^\(CONFIG_ISDN_LOG_CC_\)..=:\1${I4L_LANG}=:g" < ${FILESDIR}/config-${PV} > .config || die "failed to modify .config"
-			;;
-		*)
-			# Others get a generic isdnlog.
-			sed -e "s:^\(CONFIG_ISDN_LOG_CC=\).*$:\1'${I4L_CC_LOW}':g" \
-				-e "s:^\(CONFIG_ISDN_LOG_CC_\)..=:\1${I4L_LANG}=:g" < ${FILESDIR}/config-${PV} > .config || die "failed to modify .config"
-			;;
-	esac
-
-	useq X || \
-		sed -i -e "s:^CONFIG_BUILDX11=.*$:#:g" \
-			-e "s:^CONFIG_XISDNLOAD=.*$:#:g" \
-			-e "s:^CONFIG_XMONISDN=.*$:#:g" .config
-
-	# Patch in order to make generic config for countries which are not known to isdnlog source
-	sed -i -e "s:\$(INSTALL_DATA) rate-:-\$(INSTALL_DATA) rate-:g" \
-		-e "s:\$(INSTALL_DATA) holiday-:-\$(INSTALL_DATA) holiday-:g" isdnlog/Makefile.in
-
-	# if specified, convert all relevant files from latin1 to UTF-8
-	if useq unicode; then
-		for i in isdnlog/samples/{isdn,rate}.conf* isdnlog/*-{at,ch,de,no}.dat isdnlog/{Isdn,.country-alias}; do
-			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-		done
-	fi
-}
-
-src_compile() {
-	for i in eicon; do
-		cd $i && autoconf || \
-			die "autoconf failed in dir $i"
-		cd ..
-	done
-	make subconfig || die "make subconfig failed"
-	make || die "make failed"
-}
-
-src_install() {
-	keepdir /var/lib/isdn
-	dodir /dev /etc/isdn /usr/bin /usr/sbin
-	make DESTDIR=${D} install || die "make install failed"
-
-	# move ISAR.BIN (hisax firmware) to /lib/firmware
-	insinto /lib/firmware
-	doins ${D}/usr/share/isdn/ISAR.BIN
-	rm -f ${D}/usr/share/isdn/ISAR.BIN
-
-	# remove obsolete firmware files (these are in net-dialup/isdn-firmware)
-	rm -f ${D}/usr/share/isdn/{bip1120.btl,dnload.bin,ds4bri.bit,dspdload.bin}
-	rm -f ${D}/usr/share/isdn/{loadpg.bin,pc_??_ca.bin,prload.bin,te_????.*}
-
-	# install autoload/hotplug blacklist
-	insinto /etc/hotplug/blacklist.d
-	newins ${FILESDIR}/isdn.blacklist isdn
-
-	# install docs (base)
-	dodoc NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh FAQ/_howto/xp*
-
-	# install docs (ipppd)
-	docinto ipppd
-	dodoc LEGAL.ipppcomp ipppd/{README,README.*.ORIG,NOTES.IPPPD} ipppcomp/README.LZS  # ipppd/README.RADIUS
-	docinto ipppd/example
-	dodoc FAQ/_example/*.txt
-	docinto ipppd/howto
-	dodoc FAQ/_howto/{dns*,i4l_ipx*,isdn*,lan*,leased*,masq*,mppp*,ppp*,route*}
-
-	# install docs (isdnlog)
-	docinto isdnlog
-	dodoc isdnlog/{BUGS,FAQ,Isdn,NEWS,README*} FAQ/_howto/win*
-	docinto isdnlog/areacode
-	dodoc areacode/*.doc
-	docinto isdnlog/contrib/isdnbill
-	dodoc isdnlog/contrib/isdnbill/{*.isdnbill,*.gz}
-	docinto isdnlog/contrib/winpopup
-	dodoc isdnlog/contrib/winpopup/*
-
-	# install docs (eft)
-	docinto eft
-	dodoc eurofile/{CHANGES,INSTALL,README*,TODO}
-	newdoc eurofile/src/wuauth/README README.AUTHLIB
-	docinto eft/scripts
-	dodoc eurofile/scripts/{eft_useradd,check_system,ix25test,eftd.sh,eftp.sh}
-
-	# install init-scripts
-	newinitd ${FILESDIR}/isdn.initd isdn
-	newinitd ${FILESDIR}/hisax.initd hisax
-	newinitd ${FILESDIR}/net.ippp0 net.ippp0
-	newinitd ${FILESDIR}/isdnlog.initd isdnlog.contr0
-
-	# install init-configs
-	dodir /etc/conf.d  # BUG: w/o newconfd failes
-	newconfd ${FILESDIR}/isdn.confd isdn
-	newconfd ${FILESDIR}/isdnlog.confd isdnlog.contr0
-
-	# install example ippp scripts and configs
-	exeinto /etc/ppp
-	insinto /etc/ppp
-	doins ${FILESDIR}/{ioptions,options.ippp0}
-
-	# install example isdn configs
-	insinto /etc/isdn
-	doins isdnlog/samples/{isdn,rate}.conf.{at,de,lu,nl,no,pl}
-	newins isdnlog/samples/isdn.conf isdn.conf.unknown
-	if [ -f isdnlog/samples/isdn.conf.${I4L_CC_LOW} ]; then
-		newins isdnlog/samples/isdn.conf.${I4L_CC_LOW} isdn.conf
-	else
-		doins isdnlog/samples/isdn.conf
-	fi
-	if [ -f isdnlog/samples/rate.conf.${I4L_CC_LOW} ]; then
-		newins isdnlog/samples/rate.conf.${I4L_CC_LOW} rate.conf
-	fi
-	sed -i -e "s:/usr/lib/isdn/:/usr/share/isdn/:g" ${D}/etc/isdn/isdn.conf*
-
-	# install example hisax config
-	insinto /etc
-	doins ${FILESDIR}/hisax.conf
-
-	# install sample provider script
-	exeinto /etc/isdn
-	doexe isdnlog/samples/provider
-
-	# rename isdnlog options file
-	insinto /etc/isdn
-	mv -f ${D}/etc/isdn/isdnlog.isdnctrl0.options ${D}/etc/isdn/isdnlog.options.contr0
-
-	# install isdnlog data files
-	insinto /usr/share/isdn
-	doins isdnlog/*.dat
-
-	# install logrotate configs
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/isdnlog.logrotated isdnlog
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please edit:"
-	einfo
-	einfo "- /etc/conf.d/isdn   to contain your ISDN kernel modules"
-	einfo "- /etc/hisax.conf    if you have hisax supported cards"
-	einfo "- /etc/ppp/*         critical if you need networking"
-	einfo
-	einfo "For isdnlog you should edit:"
-	einfo
-	einfo "- /etc/conf.d/isdnlog.contr0"
-	einfo "- /etc/isdn/isdnlog.options.contr0"
-	einfo "- /etc/isdn/*.conf"
-	einfo
-	einfo "/etc/init.d/isdn will save and restore your isdnctrl config."
-	einfo "it will also handle the modem-register daemon."
-	einfo
-	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections"
-	einfo "which you need to set up using isdnctrl first!"
-	einfo
-	einfo "/etc/init.d/isdnlog.contr0 starts and stops isdnlog for contr0"
-	einfo "You can symlink it to isdnlog.contr1 and copy the corresponding"
-	einfo "configs if you have more than one card."
-	einfo
-}
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild
index 8ca99064d6df..6365f252b56f 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild,v 1.2 2005/07/02 09:34:30 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild,v 1.3 2005/09/03 20:41:21 sbriesen Exp $
 
 inherit eutils linux-info multilib gnuconfig
 
@@ -11,7 +11,7 @@ DESCRIPTION="ISDN4Linux Utils"
 SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.isdn4linux.de/"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc x86"
 LICENSE="GPL-2"
 IUSE="X unicode ipppd isdnlog eurofile"
 #IUSE="X unicode ipppd isdnlog eurofile mysql postgres oracle"
diff --git a/net-dialup/isdn4k-utils/metadata.xml b/net-dialup/isdn4k-utils/metadata.xml
index 1fa8855a476e..600ae8bd3568 100644
--- a/net-dialup/isdn4k-utils/metadata.xml
+++ b/net-dialup/isdn4k-utils/metadata.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
-<longdescription>ISDN4Linux Utils</longdescription>
+	<herd>net-dialup</herd>
+	<maintainer>
+		<email>sbriesen@gentoo.org</email>
+		<name>Stefan Briesenick</name>
+	</maintainer>
+	<longdescription lang="en">
+		The isdn4k-utils package contains a collection of utilities needed for
+		configuring an ISDN subsystem.
+	</longdescription>
 </pkgmetadata>