removed old version, fixed whitespace error.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 9 insertions, 131 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 55e024f6a1bd..6e0b484f7e61 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.39 2005/09/03 20:25:17 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.40 2005/09/03 20:32:22 sbriesen Exp $
+
+  03 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  -capi4k-utils-20050322-r1.ebuild, capi4k-utils-20050718-r1.ebuild:
+  removed old version, fixed whitespace error.
 
 *capi4k-utils-20050718-r1 (03 Sep 2005)
 
diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index d94430a305b6..83181e1d5f5d 100644
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,8 +1,7 @@
 MD5 5dc6f506ad44aae8328d0690e94eb688 capi4k-utils-20041006-r5.ebuild 3736
-MD5 03243c209893699ce44a97f2090546fe capi4k-utils-20050322-r1.ebuild 4014
 MD5 2c1a45b850f5072a7e30fb95cada2fa0 capi4k-utils-20050718.ebuild 3978
-MD5 a4e740381fc9f9b45c6cf646a7f4d09a capi4k-utils-20050718-r1.ebuild 5079
-MD5 f6b3f7ddfbbd6b02a31b08036c9eba0b ChangeLog 7917
+MD5 45c08a2cf59e93b48140cc439e5ca8a4 capi4k-utils-20050718-r1.ebuild 5078
+MD5 6298e06bacadb6ec363f3622a8655460 ChangeLog 8089
 MD5 57ebf0922074a9d61182c51349de5d53 metadata.xml 618
 MD5 aa0258d1e27f2b71ec2a6a950127831f capi4k-utils-20050509.ebuild 3977
 MD5 c1f67e98c19fe5ece86b9242a00e6a38 files/README.gentoo 2800
@@ -20,7 +19,6 @@ MD5 95524e27e1ed6d91b3de60e375f3f7f7 files/capi.pcmcia 762
 MD5 266a6a842420d7bee03b4f8e44d7062b files/capi.blacklist 335
 MD5 87e252d1e2e88ccf3d5177f6a60e2793 files/capi.hotplug 5089
 MD5 6418461a6c702da694ff8f7ef944af00 files/capi.pcmcia.conf 1218
-MD5 709e4079ecd09537691845755cb9136d files/digest-capi4k-utils-20050322-r1 75
 MD5 2ab6ed3bc0de68c33e2ade1979dd4c0a files/digest-capi4k-utils-20050718-r1 75
 MD5 e74f9b822b6f485ca6ff834c2699151a files/20041006/README.gentoo 1492
 MD5 fb9f9b4003d8d1647e23cf7b329386f6 files/20041006/capi.confd 424
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050322-r1.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050322-r1.ebuild
deleted file mode 100644
index f33a7afbfa71..000000000000
--- a/net-dialup/capi4k-utils/capi4k-utils-20050322-r1.ebuild
+++ /dev/null
@@ -1,123 +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/capi4k-utils/capi4k-utils-20050322-r1.ebuild,v 1.1 2005/04/24 13:31:48 genstef Exp $
-
-YEAR_PV=${PV:0:4}
-MON_PV=${PV:4:2}
-DAY_PV=${PV:6:2}
-MY_P=${PN}-${YEAR_PV}-${MON_PV}-${DAY_PV}
-PPPVERSIONS="2.4.2 2.4.3"  # versions in portage
-
-DESCRIPTION="CAPI4Linux Utils"
-HOMEPAGE="ftp://ftp.in-berlin.de/pub/capi4linux/"
-SRC_URI="ftp://ftp.in-berlin.de/pub/capi4linux/${MY_P}.tar.gz
-	ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-
-DEPEND="virtual/linux-sources
-	dev-lang/perl
-	>=sys-apps/sed-4
-	virtual/os-headers
-	sys-devel/automake
-	>=sys-devel/autoconf-2.50
-	sys-devel/libtool"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
-	cd ${S}
-	# set our config
-	cp -f ${FILESDIR}/config .config
-	# patch includes of all *.c files
-	sed -i -e "s:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g" */*.c || die "sed failed"
-	# patch all Makefile.am and Rules.make to use our CFLAGS
-	sed -i -e "s:^CFLAGS\(.*\)-O2:CFLAGS\1${CFLAGS}:g" */Makefile.* */Rules.make || die "sed failed"
-	# patch capi20/Makefile.am to use -fPIC for shared library
-	sed -i -e "s:^\(libcapi20_la_CFLAGS = \):\1-fPIC :g" capi20/Makefile.* || die "sed failed"
-	# patch pppdcapiplugin/Makefile to use only the ppp versions we want
-	sed -i -e "s:^\(PPPVERSIONS = \).*$:\1${PPPVERSIONS}:g" pppdcapiplugin/Makefile || die "sed failed"
-	# patch capiinit/capiinit.c to look also in /lib/firmware
-	sed -i -e "s:\(\"/lib/firmware/isdn\",\):\1 \"/lib/firmware\",:g" capiinit/capiinit.c || die "sed failed"
-	# no, we don't need any devices nodes
-	sed -i -e "s:\(sh scripts/makedev.sh\):echo \1:g" Makefile || die "sed failed"
-}
-
-src_compile() {
-	# required by fPIC patch
-	cd ${S}/capi20 || die "capi20 directory not found"
-	ebegin "Updating autotools-generated files"
-	aclocal -I . || die "aclocal failed"
-	automake -a || die "automake failed"
-	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-	libtoolize -f -c || die "libtoolize failed"
-	eend $?
-	cd ${S}
-
-	emake subconfig || die "make subconfig failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	# install docs
-	newdoc rcapid/README README.rcapid
-	dodoc scripts/makedev.sh ${FILESDIR}/README.gentoo
-	docinto pppdcapiplugin; dodoc pppdcapiplugin/README pppdcapiplugin/examples/*
-
-	# install init-script + init-config
-	dodir /etc/conf.d  # BUG: w/o newconfd fails
-	newinitd ${FILESDIR}/capi.initd capi
-	newconfd ${FILESDIR}/capi.confd capi
-
-	# install USB hotplug stuff
-	insinto /etc/hotplug/blacklist.d
-	newins ${FILESDIR}/capi.blacklist capi
-	insinto /etc/hotplug/usb
-	newins ${FILESDIR}/capi.usermap capi.usermap
-	exeinto /etc/hotplug/usb
-	newexe ${FILESDIR}/capi.hotplug capi
-
-	# example config
-	insinto /etc
-	insopts -m 0600
-	doins ${FILESDIR}/capi.conf
-
-	# rcapid config for xinetd
-	insinto /etc/xinetd.d
-	insopts -m 0644
-	newins ${FILESDIR}/rcapid.xinetd rcapid
-
-	# install DSL/ISDN sample config
-	insinto /etc/ppp/peers
-	doins pppdcapiplugin/peers/t-dsl ${FILESDIR}/capi-isdn
-
-	# very useful tool ;-)
-	dobin scripts/isdncause
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please read the instructions in:"
-	einfo "/usr/share/doc/${PF}/README.gentoo.gz"
-	einfo
-	einfo "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
-	einfo "If you run"
-	einfo "  emerge isdn-firmware"
-	einfo "you will probably find your board's firmware in /lib/firmware."
-	einfo
-	einfo "If you have another active ISDN board, you should create"
-	einfo "/lib/firmware and copy there your board's firmware."
-	einfo
-	ewarn "If you're upgrading from an older capi4k-utils, you must recompile"
-	ewarn "the other packages on your system that link with libcapi after the"
-	ewarn "upgrade completes. To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn
-}
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050718-r1.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050718-r1.ebuild
index fe6625aae074..41bbe5af7ea6 100644
--- a/net-dialup/capi4k-utils/capi4k-utils-20050718-r1.ebuild
+++ b/net-dialup/capi4k-utils/capi4k-utils-20050718-r1.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/capi4k-utils/capi4k-utils-20050718-r1.ebuild,v 1.1 2005/09/03 20:25:17 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20050718-r1.ebuild,v 1.2 2005/09/03 20:32:22 sbriesen Exp $
 
 inherit eutils multilib gnuconfig linux-info
 
@@ -89,7 +89,7 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}/capi.conf"
 	dodoc "${FILESDIR}/README.gentoo" scripts/makedev.sh
-	
+
 	# install USB hotplug stuff
 	if use usb; then
 		insinto /etc/hotplug/blacklist.d
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322-r1 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322-r1
deleted file mode 100644
index 2bd55066b133..000000000000
--- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20050322-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99fff14616c981ec0d0cf67c1a4ac772 capi4k-utils-2005-03-22.tar.gz 679621