Drop old revisions

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 6 insertions, 345 deletions

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index b25f135af113..807c3a598961 100644
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.80 2014/06/22 20:50:59 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.81 2014/06/28 07:24:31 pinkbyte Exp $
+
+  28 Jun 2014; Sergey Popov <pinkbyte@gentoo.org>
+  -capi4k-utils-20050718-r3.ebuild, -capi4k-utils-20050718-r5.ebuild,
+  -files/capi20-types.diff:
+  Drop old revisions
 
   22 Jun 2014; Mikle Kolyada <zlogene@gentoo.org>
   capi4k-utils-20050718-r6.ebuild:
diff --git a/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild
deleted file mode 100644
index 8c22dc873f80..000000000000
--- a/net-dialup/capi4k-utils/capi4k-utils-20050718-r3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 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-r3.ebuild,v 1.19 2014/04/03 10:10:27 tomwij Exp $
-
-EAPI=1
-inherit eutils multilib linux-info
-
-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 2.4.4"  # 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
-	http://voip-cell.eu/gentoo/distfiles/${PF/utils/patches}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="fax +pppd tcpd usb pcmcia"
-
-DEPEND="virtual/linux-sources
-	virtual/os-headers
-	>=sys-apps/sed-4"
-
-RDEPEND="usb? ( virtual/udev )
-	pcmcia? ( sys-apps/pcmciautils )
-	dev-lang/perl"
-
-S="${WORKDIR}/${PN}"
-PATCHDIR="${WORKDIR}/capi4k-patches"
-
-pkg_setup() {
-	# check kernel config
-	CONFIG_CHECK="~ISDN ~ISDN_CAPI ~ISDN_CAPI_CAPI20"
-	use pppd && CONFIG_CHECK="${CONFIG_CHECK} ~ISDN_CAPI_MIDDLEWARE ~ISDN_CAPI_CAPIFS_BOOL"
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# add ppp-2.4.4 support
-	epatch "${PATCHDIR}/pppd244.diff"
-
-	# apply msg2str-safety patch (see bug #170870)
-	epatch "${PATCHDIR}/msg2str-safety.diff"
-
-	# apply sys/types patch (needed for glibc-2.7)
-	epatch "${FILESDIR}/capi20-types.diff"
-
-	# set our config
-	cp -f "${FILESDIR}/config" .config
-	# copy init-script config
-	cp -f "${FILESDIR}/capi.confd" capi.confd
-	# patch all Makefile.* and Rules.make to use our CFLAGS
-	sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make || die "sed failed"
-	# patch capi20/Makefile.* to use -fPIC for shared library
-	sed -i -e "s:^\(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"
-	# add --libdir to configure call in Makefile
-	sed -i -e "s:\(\./configure \):\1--libdir=/usr/$(get_libdir) :g" Makefile || die "sed failed"
-	# patch /usr/lib/pppd in pppdcapiplugin tree
-	sed -i -e "s:/usr/lib/pppd:/usr/$(get_libdir)/pppd:g" \
-		pppdcapiplugin/ppp-*/Makefile pppdcapiplugin/{README,*.8} || die "sed failed"
-
-	# USB hotplug
-	use usb || sed -i -e "s:^\(CAPI_HOTPLUG_.*\)$:### \1:g" capi.confd
-	# build rcapid
-	use tcpd || sed -i -e "s:^\(CONFIG_RCAPID=.*\)$:# \1:g" .config
-	# build capifax
-	use fax || sed -i -e "s:^\(CONFIG_CAPIFAX=.*\)$:# \1:g" .config
-	# build pppdcapiplugin
-	use pppd || sed -i -e "s:^\(CONFIG_PPPDCAPIPLUGIN=.*\)$:# \1:g" .config
-}
-
-src_compile() {
-	emake subconfig || die "make subconfig failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# fixing permissions (see bug #136120)
-	fperms 0644 /usr/share/man/man8/capiplugin.8
-
-	# install base
-	dobin scripts/isdncause
-	newinitd "${FILESDIR}/capi.initd" capi
-	newconfd capi.confd capi
-	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
-		newins "${FILESDIR}/capi.blacklist" capi
-		insinto /etc/hotplug/usb
-		newins "${FILESDIR}/capi.usermap" capi.usermap
-		exeinto /etc/hotplug/usb
-		newexe "${FILESDIR}/capi.hotplug" capi
-	fi
-
-	# install PCMCIA stuff
-	if use pcmcia; then
-		insinto /etc/pcmcia
-		newins "${FILESDIR}/capi.pcmcia.conf" capi.conf
-		exeinto /etc/pcmcia
-		newexe "${FILESDIR}/capi.pcmcia" capi
-	fi
-
-	# install rcapid stuff
-	if use tcpd; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/rcapid.xinetd" rcapid
-		newdoc rcapid/README README.rcapid
-	fi
-
-	# install pppdcapiplugin stuff
-	if use pppd; then
-		insinto /etc/ppp/peers
-		doins pppdcapiplugin/peers/t-dsl
-		docinto pppdcapiplugin
-		dodoc pppdcapiplugin/README pppdcapiplugin/examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "Please read the instructions in README.gentoo in:"
-	elog "/usr/share/doc/${PF}/"
-	elog
-	elog "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
-	elog "If you run"
-	elog "  emerge isdn-firmware"
-	elog "you will probably find your board's firmware in /lib/firmware."
-	elog
-	elog "If you have another active ISDN board, you should create"
-	elog "/lib/firmware and copy there your board's firmware."
-	elog
-	elog "There're several other packages available, which might have"
-	elog "the CAPI driver you need for your card(s):"
-	elog "  net-dialup/fritzcapi - AVM passive ISDN controllers"
-	elog "  net-dialup/fcdsl     - AVM ISDN/DSL controllers PCI/USB"
-	elog
-	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-r5.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20050718-r5.ebuild
deleted file mode 100644
index 9d717499e51a..000000000000
--- a/net-dialup/capi4k-utils/capi4k-utils-20050718-r5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2013 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-r5.ebuild,v 1.3 2013/06/18 05:00:43 pinkbyte Exp $
-
-EAPI="3"
-
-inherit eutils multilib linux-info
-
-YEAR_PV="${PV:0:4}"
-MON_PV="${PV:4:2}"
-DAY_PV="${PV:6:2}"
-MY_P="${PN}-${YEAR_PV}-${MON_PV}-${DAY_PV}"
-
-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
-	http://sbriesen.de/gentoo/distfiles/${PF/utils/files}.tar.xz
-	http://sbriesen.de/gentoo/distfiles/${PF/utils/patches}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="fax +pppd rcapid"
-
-COMMON_DEP="pppd? ( net-dialup/ppp )"
-
-DEPEND="${COMMON_DEP}
-	virtual/linux-sources
-	virtual/os-headers
-	app-arch/xz-utils
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMON_DEP}
-	dev-lang/perl"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	# check kernel config
-	CONFIG_CHECK="~ISDN ~ISDN_CAPI ~ISDN_CAPI_CAPI20"
-	use pppd && CONFIG_CHECK="${CONFIG_CHECK} ~ISDN_CAPI_MIDDLEWARE ~ISDN_CAPI_CAPIFS_BOOL"
-	get_version  # config checked later in pkg_postinst
-
-	# find installed pppd version
-	if use pppd; then
-		PPPVERSION=$(/usr/sbin/pppd 2>&1 --version | sed -n "s:^.* \([0-9.]\+\)\$:\1:p")
-		if [ -n "${PPPVERSION}" ]; then
-			einfo "Found installed pppd version:"
-			einfo "    pppd version ${PPPVERSION}"
-		else
-			die "No pppd installation found"
-		fi
-	fi
-}
-
-src_prepare() {
-	# add ppp-2.4.4 support
-	epatch "${WORKDIR}/capi4k-patches/pppd244.diff"
-
-	# add ppp-2.4.5 support
-	epatch "${WORKDIR}/capi4k-patches/pppd245.diff"
-
-	# apply rcapid patches
-	epatch "${WORKDIR}/capi4k-patches/rcapid.diff"
-
-	# apply msg2str-safety patch (see bug #170870)
-	epatch "${WORKDIR}/capi4k-patches/msg2str-safety.diff"
-
-	# apply capi20.h patches (needed for glibc-2.7)
-	epatch "${WORKDIR}/capi4k-patches/capi20-include.diff"
-
-	# set our config
-	cp -f "${WORKDIR}/capi4k-files/config" .config
-	# patch all Makefile.* and Rules.make to use our CFLAGS
-	sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make || die "sed failed"
-	# patch capi20/Makefile.* to use -fPIC for shared library
-	sed -i -e "s:^\(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${PPPVERSION}: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"
-	# add --libdir to configure call in Makefile
-	sed -i -e "s:\(\./configure \):\1--libdir=/usr/$(get_libdir) :g" Makefile || die "sed failed"
-	# patch /usr/lib/pppd in pppdcapiplugin tree
-	sed -i -e "s:/usr/lib/pppd:/usr/$(get_libdir)/pppd:g" \
-		pppdcapiplugin/ppp-*/Makefile pppdcapiplugin/{README,*.8} || die "sed failed"
-	# respecting LDFLAGS (see bug #293209)
-	sed -i -e "s:^LDFLAGS\s\(\s*\)=:LDFLAGS+\1=:g" \
-		{capiinfo,capiinit,capifax,rcapid,avmb1}/Makefile* pppdcapiplugin/Rules.make
-	# build rcapid
-	use rcapid || sed -i -e "s:^\(CONFIG_RCAPID=.*\)$:# \1:g" .config
-	# build pppdcapiplugin
-	if use pppd; then
-		[ -d "pppdcapiplugin/ppp-${PPPVERSION}" ] || die "ERROR: no pppdcapiplugin for version ${PPPVERSION}"
-	else
-		sed -i -e "s:^\(CONFIG_PPPDCAPIPLUGIN=.*\)$:# \1:g" .config
-	fi
-	# build capifax
-	use fax || sed -i -e "s:^\(CONFIG_CAPIFAX=.*\)$:# \1:g" .config
-}
-
-src_configure() {
-	# bug 468662 - we NEED to redefine AR and CC both with tc-export and at compile phase
-	tc-export AR CC
-	emake subconfig || die "emake subconfig failed"
-}
-
-src_compile() {
-	# bug 468662 - we NEED to redefine AR and CC both with tc-export and at compile phase
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# install base
-	dobin scripts/isdncause
-	newinitd "${WORKDIR}/capi4k-files/capi.initd" capi
-	newconfd "${WORKDIR}/capi4k-files/capi.confd" capi
-	insinto /etc
-	doins "${WORKDIR}/capi4k-files/capi.conf"
-	dodoc "${WORKDIR}/capi4k-files/README.gentoo" scripts/makedev.sh
-
-	# install rcapid stuff
-	if use rcapid; then
-		insinto /etc/xinetd.d
-		newins "${WORKDIR}/capi4k-files/rcapid.xinetd" rcapid
-		newdoc rcapid/README README.rcapid
-	fi
-
-	# install pppdcapiplugin stuff
-	if use pppd; then
-		insinto /etc/ppp/peers
-		doins pppdcapiplugin/peers/t-dsl
-		docinto pppdcapiplugin
-		dodoc pppdcapiplugin/README pppdcapiplugin/examples/*
-		# fixing permissions (see bug #136120)
-		fperms 0644 /usr/share/man/man8/capiplugin.8
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "Please read the instructions in README.gentoo in:"
-	elog "/usr/share/doc/${PF}/"
-	elog
-	elog "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
-	elog "If you run"
-	elog "  emerge isdn-firmware"
-	elog "you will probably find your board's firmware in /lib/firmware."
-	elog
-	elog "If you have another active ISDN board, you should create"
-	elog "/lib/firmware and copy there your board's firmware."
-	elog
-	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."
-	if use pppd; then
-		ewarn
-		ewarn "If you're upgrading net-dialup/ppp you have to recompile"
-		ewarn "capi4k-utils to get the capiplugin for your pppd version."
-	fi
-	elog
-	elog "If any of the following kernel configuration options is missing, you"
-	elog "should reconfigure and rebuild your kernel before using capi4k-utils."
-	linux-info_pkg_setup
-	elog
-}
diff --git a/net-dialup/capi4k-utils/files/capi20-types.diff b/net-dialup/capi4k-utils/files/capi20-types.diff
deleted file mode 100644
index 5619c48d0b09..000000000000
--- a/net-dialup/capi4k-utils/files/capi20-types.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- capi4k-utils.orig/capi20/capi20.h	2000-11-19 11:15:01.000000000 +0100
-+++ capi4k-utils/capi20/capi20.h	2007-11-20 21:37:13.000000000 +0100
-@@ -21,6 +21,7 @@
- #define __CAPI20_H__
- 
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #ifdef __cplusplus
- extern "C" {