Version bump, incorporating patches, bug reports, suggestions & other helpful input...

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

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 661ae9db67d50a31fc42c57ae11d30ea8271ef51..0d2343217d3b6445cb457880506b90fb828b5509 100644 (file)
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/dahdi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.2 2009/10/22 18:19:35 chainsaw Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.3 2010/04/13 12:04:21 chainsaw Exp $
+
+*dahdi-2.2.1.1 (13 Apr 2010)
+
+  13 Apr 2010; <chainsaw@gentoo.org> +dahdi-2.2.1.1.ebuild:
+  Version bump, incorporating patches, bug reports, suggestions & other
+  helpful input from Stefan Flemming, Michael Higgins, Oliver Jaksch, Jaco
+  Kroon, Kerin "kerframil" Millar & Diego E. "Flameeyes" Pettenò. Closes
+  bugs #296637, #302316, #302874, #305533, #308099 & #308467.
 
 *dahdi-2.2.0.2 (22 Oct 2009)
 

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 827ebffd8b7fa0d958a1c00d295685aa6b3dbfbd..71c4f33bc96dc995da11c9f3566487c449fc3172 100644 (file)
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -13,16 +13,20 @@ DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
 DIST dahdi-fw-vpmadt032-1.07.tar.gz 41376 RMD160 33dfc6da198065a33de516bdd2e4185bb7355e75 SHA1 fd470e7aec0db62e3750aa4819ff03b70c6e9977 SHA256 f566cc82203bc3a49f4850ac08dec613d1a2eeda437482e1d0c2da1e9e8bb68e
 DIST dahdi-fwload-vpmadt032-1.17.0.tar.gz 147425 RMD160 f13f96b23a8865e17f6d171102508682b1011a87 SHA1 76cb695c845e0a56972cf28490d70e03a260d929 SHA256 a94f5fc4944112706642e360878f81fed2fa524b24ec0981a25da5232e5952c8
+DIST dahdi-fwload-vpmadt032-1.20.0.tar.gz 146556 RMD160 eb7bbff9980f3723ba7eb84aed91778c4cf3a40f SHA1 3b4df3872a991c88daf058611f6663b069f2a4e8 SHA256 858043b38d09a70371d762c37b949f1031a11fb7623a4cce58389ec4d3246dc2
 DIST dahdi-linux-2.1.0.4.tar.gz 1251822 RMD160 746a6b266e51003726046582bdbfcca2f6d11194 SHA1 e5fa4220b995b2841f1658e29fe710a649b1bd9c SHA256 42fde494ed205026037f6164f9112a7a7cac55adc8f8a535e3867ca83ae8c239
 DIST dahdi-linux-2.2.0.2.tar.gz 1387811 RMD160 2fec5a75bb9be328d5de4a9282355490c787d266 SHA1 58a5244ee589d50cd3add601f6867cc82ee2e7cd SHA256 55da659f6acd5f706c0eaf74be8ed3d7fa3a5b1337954b5b663633e1300e4593
+DIST dahdi-linux-2.2.1.1.tar.gz 1418259 RMD160 c7c17bb7def165cb6487baf421c7b7c06f1d12c8 SHA1 bd8df4beffe7bdaba347a6692876528eab82f21b SHA256 0570ae088429dffcd032ed60d130c096ad2bf27b78a8da81e2cab2f416b2ef91
+DIST gentoo-dahdi-patchset-0.1.tar.bz2 62493 RMD160 ce12f54ce29ebb62fc883aba17d2f2ac75bc1d02 SHA1 3f55307c64abc77b9ca3ac4f6786a042cfde54c2 SHA256 b1325c52bc29cc7c705d246c9c3df1cb58a521d466427fbedf9afb50e5fc878e
 EBUILD dahdi-2.1.0.4.ebuild 1997 RMD160 6cee82786f6d70d34cffd7c10bdfbabf36ac7ca4 SHA1 97324730a73be1589645610f3c1d4f0458cfcf13 SHA256 3f0b8c2e36d194bba640a3c11093c85de5f6aa40dec240aeaab7da48b17218db
 EBUILD dahdi-2.2.0.2.ebuild 2445 RMD160 28f9976748f7bd49fcaff9dc67adf074e8d3f21b SHA1 8d8a391ecdf236d75306cd1e7bfe588acc55aef5 SHA256 a180b4ede9d99a075b66a8eb3603ab5ca8820ffcdeea0edb5a4680761677acc9
-MISC ChangeLog 1261 RMD160 5f8ba01259934c44b85ffb889b2193d8cce6e298 SHA1 11b6578bf620a9fb74af98e4649554e26b2e4726 SHA256 dab843e212e11c2a52a0f9cc567db196f646c2ab2fa9d9c9d84e014274e73977
+EBUILD dahdi-2.2.1.1.ebuild 1928 RMD160 d06d634d44011c2c5deff5cf03124ba35ad57267 SHA1 914a8b3e26fecbad9305097a9023fec53354f9e4 SHA256 2e840118fa5ce962de41db5a36123e83b66d0e9ea8a413011b0f188e124f78e3
+MISC ChangeLog 1635 RMD160 04a315dcf2433a00358da9c20d2007ac310ada20 SHA1 8fb27fc5bf46946bdc3d347686fa41b40c53d4bf SHA256 f541abd098e536fce1bc31a70a8cca4edd79a21e7388aedf11b02709fa10d225
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrgod8ACgkQp5vW4rUFj5ot7wCfUtDLgvwBZKEP7BgUibCtZIOF
-muQAnj68xJT5iMy0rommZDYRyfe9MAQi
-=ar+m
+iEYEARECAAYFAkvEXcsACgkQp5vW4rUFj5oDFACguudYN88eOknzSMowN+ibw3hz
+7awAmwT3b5h1wVcj3qHkYWej7qStLgOv
+=fmQ7
 -----END PGP SIGNATURE-----

diff --git a/net-misc/dahdi/dahdi-2.2.1.1.ebuild b/net-misc/dahdi/dahdi-2.2.1.1.ebuild
new file mode 100644 (file)
index 0000000..0ac6308
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.2.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.2.1.1.ebuild,v 1.1 2010/04/13 12:04:21 chainsaw Exp $
+
+EAPI=3
+
+inherit base linux-mod eutils flag-o-matic
+
+MY_P="${P/dahdi/dahdi-linux}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz
+http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-0.1.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-misc/asterisk"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+src_unpack() {
+       unpack ${A}
+       # Copy the firmware tarballs over, the makefile will try and download them otherwise
+       for file in ${A} ; do
+               cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+       done
+       # But without the .bin's it'll still fall over and die, so copy those too.
+       cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+}
+
+src_compile() {
+       unset ARCH
+       emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" all || die "Compilation failed"
+}
+
+src_install() {
+       # setup directory structure so udev rules get installed
+       mkdir -p "${D}"/etc/udev/rules.d
+
+       einfo "Installing kernel module"
+       emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" install || die "Installation failed"
+       rm -rf "$D"/lib/modules/*/modules.*
+}