Install in perl vendor directory, not site as per bug #295105. Explicitly block zaptel as per bug #295107 (both by Diego E. "Flameeyes" Pettenò). Work around Gentoo-specific broken linux headers, closes bug #290918 by Chí-Thanh Christopher Nguyễn. Do not fiddle with the hardware in the Makefile, closes bug #296359 by Jaco Kroon.

(Portage version: 2.1.7.15/cvs/Linux x86_64)

4 files changed, 56 insertions, 4 deletions

diff --git a/net-misc/dahdi-tools/ChangeLog b/net-misc/dahdi-tools/ChangeLog
index c59fcd067b71..177201174d8d 100644
--- a/net-misc/dahdi-tools/ChangeLog
+++ b/net-misc/dahdi-tools/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/dahdi-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.2 2009/10/28 11:25:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.3 2009/12/22 12:31:14 chainsaw Exp $
+
+*dahdi-tools-2.2.0-r1 (22 Dec 2009)
+
+  22 Dec 2009; <chainsaw@gentoo.org> -dahdi-tools-2.2.0.ebuild,
+  +dahdi-tools-2.2.0-r1.ebuild,
+  +files/dahdi-tools-2.2.0-no-hardware-fiddling.patch,
+  +files/dahdi-tools-2.2.0-vendorlib.patch:
+  Install in perl vendor directory, not site as per bug #295105. Explicitly
+  block zaptel as per bug #295107 (both by Diego E. "Flameeyes" Pettenò).
+  Work around Gentoo-specific broken linux headers, closes bug #290918 by
+  Chí-Thanh Christopher Nguyễn. Do not fiddle with the hardware in the
+  Makefile, closes bug #296359 by Jaco Kroon.
 
 *dahdi-tools-2.2.0 (28 Oct 2009)
 
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.2.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild
index a42e68ab3127..51d3d66e772d 100644
--- a/net-misc/dahdi-tools/dahdi-tools-2.2.0.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2009/10/28 11:25:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild,v 1.1 2009/12/22 12:31:14 chainsaw Exp $
 
 EAPI=1
 inherit eutils
@@ -15,15 +15,21 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="net-misc/dahdi
+	!net-misc/zaptel
 	virtual/libusb:0"
-
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-ifreq.patch"
+	# Work around broken 07_all_pull-libc-headers-linux.patch
+	# that seemingly nobody wants to fix.
+	if has_version ">sys-kernel/linux-headers-2.6.28-r1"; then
+		epatch "${FILESDIR}/${P}-ifreq.patch"
+	fi
 	epatch "${FILESDIR}/${P}-modprobe-suffix.patch"
+	epatch "${FILESDIR}/${P}-vendorlib.patch"
+	epatch "${FILESDIR}/${P}-no-hardware-fiddling.patch"
 }
 
 src_install() {
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
new file mode 100644
index 000000000000..c04e66241d8e
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..03bc27e05702
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch
@@ -0,0 +1,12 @@
+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))