From 15a45efe78a84a135cff09347ba959079b5b20ee Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Fri, 2 Sep 2011 09:03:34 +0000 Subject: [PATCH] Clean up old ebuilds and patches. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- net-misc/dahdi-tools/ChangeLog | 11 ++++- net-misc/dahdi-tools/Manifest | 27 +++-------- .../dahdi-tools/dahdi-tools-2.1.0.2.ebuild | 33 ------------- .../dahdi-tools/dahdi-tools-2.2.0-r1.ebuild | 39 ---------------- net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild | 35 -------------- net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild | 46 ------------------- .../files/dahdi-tools-2.1.0.2-asneeded.patch | 33 ------------- .../files/dahdi-tools-2.2.0-ifreq.patch | 12 ----- .../dahdi-tools-2.2.0-modprobe-suffix.patch | 14 ------ ...hdi-tools-2.2.0-no-hardware-fiddling.patch | 22 --------- .../files/dahdi-tools-2.2.0-vendorlib.patch | 12 ----- net-misc/dahdi-tools/files/dahdi.init | 31 ------------- 12 files changed, 16 insertions(+), 299 deletions(-) delete mode 100644 net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild delete mode 100644 net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild delete mode 100644 net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild delete mode 100644 net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild delete mode 100644 net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch delete mode 100644 net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch delete mode 100644 net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch delete mode 100644 net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch delete mode 100644 net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch delete mode 100644 net-misc/dahdi-tools/files/dahdi.init diff --git a/net-misc/dahdi-tools/ChangeLog b/net-misc/dahdi-tools/ChangeLog index b3fb870ee85c..8f8720cc7433 100644 --- a/net-misc/dahdi-tools/ChangeLog +++ b/net-misc/dahdi-tools/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/dahdi-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.13 2011/04/28 21:39:02 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.14 2011/09/02 09:03:33 chainsaw Exp $ + + 02 Sep 2011; Tony Vroon -dahdi-tools-2.1.0.2.ebuild, + -files/dahdi-tools-2.1.0.2-asneeded.patch, -dahdi-tools-2.2.0-r1.ebuild, + -files/dahdi-tools-2.2.0-ifreq.patch, + -files/dahdi-tools-2.2.0-modprobe-suffix.patch, + -files/dahdi-tools-2.2.0-no-hardware-fiddling.patch, + -files/dahdi-tools-2.2.0-vendorlib.patch, -dahdi-tools-2.3.0.ebuild, + -dahdi-tools-2.4.0.ebuild, -files/dahdi.init: + Clean up old ebuilds and patches. 28 Apr 2011; Thomas Kahle dahdi-tools-2.4.1.ebuild: x86 stable per bug 364887 diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest index 9374020001e7..efb7f6d13667 100644 --- a/net-misc/dahdi-tools/Manifest +++ b/net-misc/dahdi-tools/Manifest @@ -1,33 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX dahdi-autoconf.conf 972 RMD160 35b039cbe6a7b724332dd82f6b3b9663877ec237 SHA1 a589054d3ce47be3da98fedcb467b10c741b5e29 SHA256 c94ee0ceb9b0a2689458360b2b40c3acc7f1073d6c500e4894c29c361f1258e4 AUX dahdi-autoconf.init 5120 RMD160 5566ad783762f556c6db4b887d3a3ac3d88e0cb4 SHA1 c1b363004ae122b78041f2dee3ad60be90086a3b SHA256 e9be6e998bb61b579942a4d9a9740d3447a19214c0a293eb6d9ae0b3642b3a95 -AUX dahdi-tools-2.1.0.2-asneeded.patch 911 RMD160 83d7e9e30263e5afbf70a2d4c9425decd6ddc072 SHA1 07563eb47810a91571ee2aa99e3a0d02fb2ceaea SHA256 4dec5c730a44a9cac5b5722f1b1cc5102f800a681ea9baf25624c70753285450 -AUX dahdi-tools-2.2.0-ifreq.patch 414 RMD160 4f894a842aa58a848623eb25b2c73035f3ad3683 SHA1 688d1ad9a6b929b855fd1e4c8e173f0e04a88e1f SHA256 64bbddeb7c38bf7336537c9b263b1b8012f8b6d7e95d4f33a1713ed5f963f727 -AUX dahdi-tools-2.2.0-modprobe-suffix.patch 639 RMD160 ceeb7f7e6156effa94f4ea2d050383bb6af4c4dd SHA1 48551a175feccffdabd719111cd450a66db7cce3 SHA256 201c4640eac7188a613b0ebaa2d0874885fad82f6994bab114dfeb7f87ec3fa8 -AUX dahdi-tools-2.2.0-no-hardware-fiddling.patch 742 RMD160 d30ac52900d1b4024e548e26fb95efd7221c7919 SHA1 cb1958cc6840a56e30fa54a9a239ac3616cf35c3 SHA256 2ac30ccdd662d49ed5e3c99d180a5dfc3d7ce9d242f957da38d3535e0435822b -AUX dahdi-tools-2.2.0-vendorlib.patch 651 RMD160 3e440c2f299ec9321dda5ff4e26e69f6a0b291d8 SHA1 5ec1cf692f24ce6d06dc5fbde4a88f36453e0730 SHA256 ee449e06a86d00b8ebe2837779e9c9043a30926be9aabd2e7f3ae11e9dc2e4c8 -AUX dahdi.init 572 RMD160 c7552ca71e9fe8ccc8a54f57fc89ed4e8117ba0e SHA1 623d9a400e726d3661c14711ae161d9b8b1cf19d SHA256 d553db75e185ad856f99fb8361dd28e3873b17ca496ff2eb146fa51856f4aebb AUX dahdi.init2 696 RMD160 21ebfc44c26518122f0e88ede04ec32434601a05 SHA1 639ae92dd946c9522c1b5c425fb958e6fec9d751 SHA256 c06e70c1e53d9f9092ab853a6d0bf1efdfbeac73919c115499de32abc8202ca4 -DIST dahdi-tools-2.1.0.2.tar.gz 413598 RMD160 32b0e047c8c40ef7225b7b171d7257dc196a3d96 SHA1 1afa5aeea6020b7d5c72dee6116aab1df6559401 SHA256 07e92499187858d2f1498895af628dbe19d023c81ee92f948d300a2f58e850a5 -DIST dahdi-tools-2.2.0.tar.gz 463418 RMD160 7f2023b1d28c5ef73b34ca7efc372563baa01223 SHA1 cb28bad486b49bb22ba345d32b04d2d14ea9d198 SHA256 2ad71830c958e69b8a97c990d65cf0db426b7c9e1447133cc9ce2f1acadd0c5a -DIST dahdi-tools-2.3.0.tar.gz 523044 RMD160 edbf176ff389c2eb04fef39adec30d830045f017 SHA1 7f2203ffacf5a70a59a83a95469e24d2f9a8a0d4 SHA256 f3bbea81f70dabf9788bd8e31b1b78e06307e53a7d601d35e01888b528945ce0 -DIST dahdi-tools-2.4.0.tar.gz 530427 RMD160 af4061e05b81054c8ffd5188a8cb038fd314d78a SHA1 522caa757a530eb6d4602cb5042fd5b90a733c25 SHA256 5d656846b60b7fa47d230a048ef60f272185b5cfe74c0db63ca3033b2263ec2f DIST dahdi-tools-2.4.1.tar.gz 537767 RMD160 476594db808640a3ff72ee292e46f520f66c17e6 SHA1 aa6a4cdac8a4fae8b814c258c52eb0460336867d SHA256 58f5d09b250a8461ee597fd1b3a690f69085efab91e842c88fbad777a4695b36 -DIST gentoo-dahdi-tools-patchset-0.1.tar.bz2 1955 RMD160 539ecd93cfdae35ec64625eb032f78371370298b SHA1 889ddd7e6a029ff23ab8030cd8c86e25a2386dc1 SHA256 a57741efd0ef3bc288ee84ddbc3dbe76f5748f1c5b6b767d9696f23b647855e4 DIST gentoo-dahdi-tools-patchset-0.2.tar.bz2 1970 RMD160 25e04ad11ca3638ee5e7fdfbbbdea3db7bc6d8a4 SHA1 c694d0693dc0f500bdcebf92aba0b4ba17cba63d SHA256 ce820d3f0eb85d16bacb35edac2d5f3386df2d4d58c68c47a92c7f38c9805560 -EBUILD dahdi-tools-2.1.0.2.ebuild 876 RMD160 07d8e141abc48bf1153220346d8f5227f5d0a526 SHA1 37ac28826b5093ce59df767b6e9a8e169c609a46 SHA256 df7f39df5e22d54e437514c41eabe44217bdbf32d3dae725688259ef45698e79 -EBUILD dahdi-tools-2.2.0-r1.ebuild 1095 RMD160 c5f8600fee88eeb7178e188cbcf7c71e7e32a913 SHA1 b9dbc491b8ea80b14e073d80d0a1cda013553d6e SHA256 fa0a478ad1b5bccb0e37f30c11d34488ef20db1d2e35feca7e0d4b4a6b002323 -EBUILD dahdi-tools-2.3.0.ebuild 997 RMD160 85c75f70eae9a5fe0f500972ad031f05ad04de79 SHA1 fdf126c7849c716d224e14c6d896a636ec5db29e SHA256 8bf501d9da4e71fa6eb987bd1e5b30ba0d48eb31f09ac8ba0bc5c769fd789501 -EBUILD dahdi-tools-2.4.0.ebuild 1235 RMD160 d2a63e4e265cb34eb999a0f8228cacb49a0c9dbd SHA1 c10cc60108989af3c1e3bac099ec76075989c6d9 SHA256 00ad3f796b52c604c9bd3deb063e477268de0e6bd30bc5693ac4de27a84c8ad0 EBUILD dahdi-tools-2.4.1.ebuild 1498 RMD160 23e5df4c883625efe955ac806bbfdd99fa624aff SHA1 c8ea1a70e03633960c8929f0047741388951e3a3 SHA256 4d0b8853754c613e43d43aa8f20409662962807d600becd345aa17cf01983d03 -MISC ChangeLog 3664 RMD160 93abd257b89bdee14f99c13b3333c7546292531b SHA1 b3095328c1dc0883a40948421a035b10143beb1a SHA256 22dd9a92aeb54b3e49de926ad2739ab47a63aa337eafa53ca6cca536f6a41bc2 +MISC ChangeLog 4120 RMD160 ded3cab1e9e04bf81f4b34e337c4610c2e12c390 SHA1 ff8d3bd7e3f9cf818bc5769d698837fd6163c74f SHA256 9c08c5045b61331d2abd880aa91b329521c06da3816e44597f3fff4860e7cf70 MISC metadata.xml 331 RMD160 787054aaa3e5371c7e256d2a0b4f5e909e43a88e SHA1 6bf8e650bccb629f9807fde8dd20681517f75aeb SHA256 a839d10d9b71eb3ccee2ac1f493d64ae841977358d8908dba94ead6c4b6cf0e8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk253uMACgkQodBTJSDyo66aLQD/ZaOs12nifBRJPFGtD4yNBl47 -jCXAZ39zhB7pQbovaY4A/1anUPvC5DAqQn1mFmjZAQbU7q5E7njQcB0jwb/LCDw4 -=kxdC +iEYEARECAAYFAk5gm+4ACgkQp5vW4rUFj5qJXQCfQGZVDZbPtOsWmq3ikADvHEp2 +xZcAnjg3swCLsvQlob5Ha5yw1iDphny8 +=WUeH -----END PGP SIGNATURE----- diff --git a/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild deleted file mode 100644 index 8982329ed403..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild,v 1.1 2009/03/10 17:08:00 chainsaw Exp $ - -inherit eutils - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="http://www.asterisk.org" -SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-misc/dahdi - dev-libs/libusb" - -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-asneeded.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die "failed to install package" - emake DESTDIR="${D}" config || die "failed to install package" - - # install init script - newinitd "${FILESDIR}"/dahdi.init dahdi -} diff --git a/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild deleted file mode 100644 index 440a08a4fe27..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild,v 1.4 2009/12/22 14:27:48 chainsaw Exp $ - -EAPI=1 -inherit eutils - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="http://www.asterisk.org" -SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-misc/dahdi - !net-misc/zaptel - >=sys-kernel/linux-headers-2.6.29 - virtual/libusb:0" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-ifreq.patch" - epatch "${FILESDIR}/${P}-modprobe-suffix.patch" - epatch "${FILESDIR}/${P}-vendorlib.patch" - epatch "${FILESDIR}/${P}-no-hardware-fiddling.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die "Failed to install binaries" - emake DESTDIR="${D}" config || die "Failed to install configuration files" - - # install init script - newinitd "${FILESDIR}"/dahdi.init2 dahdi -} diff --git a/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild deleted file mode 100644 index c2c5d3cdc758..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild,v 1.1 2010/05/25 15:22:37 chainsaw Exp $ - -EAPI=3 - -inherit base - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="http://www.asterisk.org" -SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz - mirror://gentoo/gentoo-dahdi-tools-patchset-0.1.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-libs/newt - net-misc/dahdi - !net-misc/zaptel - >=sys-kernel/linux-headers-2.6.29 - virtual/libusb:0" -RDEPEND="${DEPEND}" - -EPATCH_SUFFIX="diff" -PATCHES=( "${WORKDIR}/dahdi-tools-patchset" ) - -src_install() { - emake DESTDIR="${D}" install || die "Failed to install binaries" - emake DESTDIR="${D}" config || die "Failed to install configuration files" - - # install init script - newinitd "${FILESDIR}"/dahdi.init2 dahdi -} diff --git a/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild deleted file mode 100644 index 7ff0eaf848cc..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild,v 1.4 2011/02/27 18:58:35 chainsaw Exp $ - -EAPI=3 - -inherit base - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="http://www.asterisk.org" -SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz - mirror://gentoo/gentoo-dahdi-tools-patchset-0.2.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ppp" - -DEPEND="dev-libs/newt - ppp? ( net-dialup/ppp ) - net-misc/dahdi - !net-misc/zaptel - >=sys-kernel/linux-headers-2.6.35 - virtual/libusb:0" -RDEPEND="${DEPEND}" - -EPATCH_SUFFIX="diff" -PATCHES=( "${WORKDIR}/dahdi-tools-patchset" ) - -src_compile() { - default_src_compile - if use ppp; then - emake -C ppp || die "Failed compiling ppp plugin" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "Failed to install binaries" - if use ppp; then - emake DESTDIR="${D}" -C ppp install || die "Failed to install ppp plugin" - fi - emake DESTDIR="${D}" config || die "Failed to install configuration files" - - # install init script - newinitd "${FILESDIR}"/dahdi.init2 dahdi -} diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch deleted file mode 100644 index 2801aae5ab51..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -uNr dahdi-tools-2.1.0.2.ORIG/Makefile dahdi-tools-2.1.0.2/Makefile ---- dahdi-tools-2.1.0.2.ORIG/Makefile 2009-03-10 16:48:48.000000000 +0000 -+++ dahdi-tools-2.1.0.2/Makefile 2009-03-10 16:53:46.000000000 +0000 -@@ -156,12 +156,12 @@ - $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< - - %: %.o -- $(CC) $(LDFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - - prereq: config.status - - dahdi_tool: CFLAGS+=$(NEWT_INCLUDE) --dahdi_tool: LDFLAGS+=$(NEWT_LIB) -+dahdi_tool: LIBS+=$(NEWT_LIB) - - dahdi_speed: CFLAGS+=-O0 - -@@ -173,11 +173,11 @@ - $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm - - dahdi_cfg: $(LTZ_A) --dahdi_cfg: LDFLAGS+=-lm -+dahdi_cfg: LIBS+=-lm - - fxstest: $(LTZ_SO) --fxstest: LDFLAGS+=-lm --fxotune: LDFLAGS+=-lm -+fxstest: LIBS+=-lm -+fxotune: LIBS+=-lm - - tonezones.txt: zonedata.c - perl -ne 'next unless (/\.(country|description) = *"([^"]*)/); \ diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch deleted file mode 100644 index 98ce2db7973b..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr dahdi-tools-2.2.0.ORIG/sethdlc.c dahdi-tools-2.2.0/sethdlc.c ---- dahdi-tools-2.2.0.ORIG/sethdlc.c 2009-10-28 11:07:37.000000000 +0000 -+++ dahdi-tools-2.2.0/sethdlc.c 2009-10-28 11:08:10.000000000 +0000 -@@ -43,6 +43,8 @@ - #warning "No kernel support for Ethernet over Frame Relay / HDLC, skipping it" - #endif - -+#define ifreq __kernel_ifreq -+ - - static struct ifreq req; /* for ioctl */ - static int argc; diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch deleted file mode 100644 index eea4a7a9948a..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN dahdi-tools-2.2.0.orig/Makefile dahdi-tools-2.2.0/Makefile ---- dahdi-tools-2.2.0.orig/Makefile 2009-06-08 19:02:48.000000000 +0200 -+++ dahdi-tools-2.2.0/Makefile 2009-07-19 14:32:44.246071785 +0200 -@@ -70,8 +70,8 @@ - RCCONF_FILE = /etc/dahdi/init.conf - MODULES_FILE = /etc/dahdi/modules - GENCONF_FILE = /etc/dahdi/genconf_parameters --MODPROBE_FILE = /etc/modprobe.d/dahdi --BLACKLIST_FILE = /etc/modprobe.d/dahdi.blacklist -+MODPROBE_FILE = /etc/modprobe.d/dahdi.conf -+BLACKLIST_FILE = /etc/modprobe.d/dahdi.blacklist.conf - - NETSCR_DIR := $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts )) - ifneq (,$(NETSCR_DIR)) diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch deleted file mode 100644 index c04e66241d8e..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -uNr dahdi-tools-2.2.0.ORIG/Makefile dahdi-tools-2.2.0/Makefile ---- dahdi-tools-2.2.0.ORIG/Makefile 2009-12-22 12:20:03.000000000 +0000 -+++ dahdi-tools-2.2.0/Makefile 2009-12-22 12:20:46.000000000 +0000 -@@ -293,18 +293,6 @@ - $(ADD_INITD) - endif - @echo "DAHDI has been configured." -- @echo "" -- @echo "List of detected DAHDI devices:" -- @echo "" -- @if [ `xpp/dahdi_hardware | tee /dev/stderr | wc -l` -eq 0 ]; then \ -- echo "No hardware found"; \ -- else \ -- echo ""; \ -- echo "run 'dahdi_genconf modules' to load support for only " ;\ -- echo "the DAHDI hardware installed in this system. By "; \ -- echo "default support for all DAHDI hardware is loaded at "; \ -- echo "DAHDI start. "; \ -- fi - - update: - @if [ -d .svn ]; then \ diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch deleted file mode 100644 index 03bc27e05702..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr dahdi-tools-2.2.0.ORIG/xpp/Makefile dahdi-tools-2.2.0/xpp/Makefile ---- dahdi-tools-2.2.0.ORIG/xpp/Makefile 2009-12-22 11:31:02.000000000 +0000 -+++ dahdi-tools-2.2.0/xpp/Makefile 2009-12-22 11:32:59.000000000 +0000 -@@ -28,7 +28,7 @@ - DATADIR = $(datadir)/dahdi - MANDIR = $(mandir)/man8 - HOTPLUG_USB_DIR = /etc/hotplug/usb --PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib") -+PERLLIBDIR := $(shell eval `perl -V:vendorlib`; echo "$$vendorlib") - PERL_DIRS := $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs) - PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm) - PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT)) diff --git a/net-misc/dahdi-tools/files/dahdi.init b/net-misc/dahdi-tools/files/dahdi.init deleted file mode 100644 index 483ec33df9df..000000000000 --- a/net-misc/dahdi-tools/files/dahdi.init +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/files/dahdi.init,v 1.1 2009/03/10 17:08:01 chainsaw Exp $ - -depend() { - need net -} - -checkconfig() { - if [ ! -f /etc/dahdi/system.conf ]; then - eerror "/etc/dahdi/system.conf not found. Nothing to do." - return 1 - fi - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting DAHDI" - /usr/sbin/dahdi_cfg - eend $? -} - -stop() { - ebegin "Stopping DAHDI" - /usr/sbin/dahdi_cfg -s - eend -} -- 2.26.2