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.

Package-Manager: portage-2.1.7.15/cvs/Linux x86_64

5 files changed, 63 insertions, 9 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/Manifest b/net-misc/dahdi-tools/Manifest
index 6712c323641f..0c1e2279b636 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 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
 EBUILD dahdi-tools-2.1.0.2.ebuild 876 RMD160 07d8e141abc48bf1153220346d8f5227f5d0a526 SHA1 37ac28826b5093ce59df767b6e9a8e169c609a46 SHA256 df7f39df5e22d54e437514c41eabe44217bdbf32d3dae725688259ef45698e79
-EBUILD dahdi-tools-2.2.0.ebuild 942 RMD160 46060a62a4c046d1fe2e3b59da90d0e303926550 SHA1 23674af0ab6da5da3b8d70466d8d4bb2f6bebeda SHA256 4ca2b2f7644016871832213325504862282a0b01f1693a7bdb7ded90fc558bd6
-MISC ChangeLog 1114 RMD160 827d1c390b52fd77dd23d97b71a48c13e2a6c0bc SHA1 79e5382e4ca10f9bc7079eb66b40dfb94f0661f4 SHA256 889d7a909e4b978612343366a11fa05d529314b0597f8830df1afdb4a391900f
+EBUILD dahdi-tools-2.2.0-r1.ebuild 1222 RMD160 fa411cb190e2b0ce3c80438e0123f59b23e237c4 SHA1 b9b614f1c935a16572a75ae3fb69312ae286b611 SHA256 ae29b7b155a43f74300a61b9817c9ade6f0aa05dbee03634480aca580706c541
+MISC ChangeLog 1692 RMD160 24a0739fc57afefe0d5a7fec334efb150feb61f9 SHA1 058ae62b8073ac076a764d8063b88ffeb8584833 SHA256 9bef9d43f00f3fee5e7a06dd272aa3ba09fdea474828d9c0b07f51abc34c793b
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkroKcEACgkQp5vW4rUFj5rEagCfTpolY1BOhqwmhZfKUI+gVXVk
-fiAAoJ88ONrzBSK/slLmjr/Sxl3I5HAI
-=9Vqq
+iEYEARECAAYFAkswu7EACgkQp5vW4rUFj5rTuwCgwO9I2HRkWzlJvDG7RwZ45T99
+fAUAnjQBZUYnAEgiZPP/X7SzRagCNwbs
+=yzOC
 -----END PGP SIGNATURE-----
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))