[gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2015-10-27 12:18 Agostino Sarubbo
  0 siblings, 0 replies; 25+ messages in thread
From: Agostino Sarubbo @ 2015-10-27 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     882f7e55fbb42f17d69a92317c58f3de65fe9309
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 12:17:47 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 12:17:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882f7e55

net-misc/dahdi: amd64 stable wrt bug #564014

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 net-misc/dahdi/dahdi-2.10.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
index 8f967ce..d8bc7f4 100644
--- a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
+++ b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
@@ -36,7 +36,7 @@ http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="flash"
 RESTRICT="test"
 


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2015-11-01 13:47 Mikle Kolyada
  0 siblings, 0 replies; 25+ messages in thread
From: Mikle Kolyada @ 2015-11-01 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     25a1e13066be210fa3a79e6ec8a08fab18127a61
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 13:44:31 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 13:44:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a1e130

net-misc/dahdi: x86 stable wrt bug #564014

Package-Manager: portage-2.2.20.1

 net-misc/dahdi/dahdi-2.10.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
index d8bc7f4..ebc9cf3 100644
--- a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
+++ b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
@@ -36,7 +36,7 @@ http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flash"
 RESTRICT="test"
 


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2016-03-31 10:54 Tony Vroon
  0 siblings, 0 replies; 25+ messages in thread
From: Tony Vroon @ 2016-03-31 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2248f72f1eba8a5b5cc789ef2d4404ae5ac0ce5a
Author:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 10:53:40 2016 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 10:53:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2248f72f

net-misc/dahdi: Version bump to 2.11.1 thanks to Oliver Jaksch & Rene Fuchs in bug #572736

Package-Manager: portage-2.2.28

 net-misc/dahdi/Manifest            |  1 +
 net-misc/dahdi/dahdi-2.11.1.ebuild | 81 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index e9d441d..d89d068 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -22,6 +22,7 @@ DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 SHA256 3ff26cf80555fd7470b43a87
 DIST dahdi-linux-2.10.0.1.tar.gz 2042867 SHA256 7b129903c517fbcb74e9600cd2baaf1721d8684c53525314620db7c0410055fe SHA512 7d03717947063a037e83fc13ab42e4ecc4aeb12a2d8e1f0cae5b491d2dcd948aa51381f0111e5013f355faf4d6ff00df8238e19be91852e99040a836fbf51318 WHIRLPOOL 6fcb613fbaf20a4a664a0f20c15c31b2ac8c4c54bf6c40ee951e61b0600f9700f61d73005b8ba6e34b75c62ffbc1cfc97af9d926ce3caa04e420e84212df1edb
 DIST dahdi-linux-2.10.1.tar.gz 2044847 SHA256 94c532e190fc6372f9731df71f8c590fc6f6f184d5394339ce892ac6788843aa SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087 WHIRLPOOL e114b8e200aaa94283bcf57f54e6e0be33fe7bbb5680acba43b5704733cd7e6c27eae5a6fbb9cc0314ac022c1b2892839da5b710b21991247944847e3819b0c8
 DIST dahdi-linux-2.10.2.tar.gz 2044873 SHA256 6270444cb9b345941267b162038cc45f5ef4485139176e88e2c4d22fa35a2c59 SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537 WHIRLPOOL 2c640728a31cdd45a34cf78b1f07587242fc3e68eeb37de006bba237cbc89ea7ea4fa9ad568775761225dbdefdaff1de152bbfd05dfbbbc693efdf723835d162
+DIST dahdi-linux-2.11.1.tar.gz 2045435 SHA256 f59f382365118205e77d2874f1c0e1546e936247bcc45f07a43bc21778bee9df SHA512 db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224 WHIRLPOOL 4380cfb695097b40df3b6a46296406bae8db5c19a397d5f9a3c5ef8d93f7d7529fdd09070ccb5bfdd3c6077cd1bffbfaf5ee8f4f68f1065ed2adfc0dec656e8b
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 SHA256 31efbb79403c57e095bd032939d65b3c15eb5964e837476b1ade42cea9c2b9f7 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770 WHIRLPOOL f6aba2558bd8a0bb3998977187d50ea95b0e169aadb18372ee8d7d5df8624e5d2c40e3ae98bcf2c5ed9680920f5d813563d15bdab6c3d167bb1539ba4efe6500
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 SHA256 00dcc6ac490f6d56c806bde06b9fb76ed09555cb879880d48f8087f50adfbb31 SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04 WHIRLPOOL 4ce8e9930c59da65fe66250009dea21a7bbed4b654d9f6aed832525a56c5265c20acfbcbf38a58a0ce190df3bac66080d4513dcdf796c4823fa6ceefafa51c96
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 SHA256 4bd57ffa61d718b847080af274fdf2414bf83a6567dffa05786e3e9b900cdf5f SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517 WHIRLPOOL fbf86b33f7961cdd8053fe7898908088fb1579705915e5cddee01d5bae3cc996a061af622d4868e5b82270b22043529f69a50580d45451a3400b664835965760

diff --git a/net-misc/dahdi/dahdi-2.11.1.ebuild b/net-misc/dahdi/dahdi-2.11.1.ebuild
new file mode 100644
index 0000000..d4a4459
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.11.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.3
+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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+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/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2017-02-22 21:02 Michael Weber
  0 siblings, 0 replies; 25+ messages in thread
From: Michael Weber @ 2017-02-22 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4ea0fe6a88efffe9d942631ceeeaefa1b23abe13
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 21:01:53 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 21:01:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea0fe6a

net-misc/dahdi: Pass LDFLAGS="$(raw-ldflags)" (bug 447648).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/dahdi/dahdi-2.11.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/dahdi/dahdi-2.11.1.ebuild b/net-misc/dahdi/dahdi-2.11.1.ebuild
index d4a44598ae..699e31f10a 100644
--- a/net-misc/dahdi/dahdi-2.11.1.ebuild
+++ b/net-misc/dahdi/dahdi-2.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -71,7 +71,7 @@ src_prepare() {
 
 src_compile() {
 	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2017-02-22 22:03 Michael Weber
  0 siblings, 0 replies; 25+ messages in thread
From: Michael Weber @ 2017-02-22 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     24a06b00206e8c645acc1aed5d115868ead02e1f
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 22:02:46 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 22:02:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a06b00

net-misc/dahdi: Pass LDFLAGS="$(raw-ldflags)" to install, too (bug 447648).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/dahdi/dahdi-2.11.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-2.11.1.ebuild b/net-misc/dahdi/dahdi-2.11.1.ebuild
index 699e31f10a..d9cf22dde4 100644
--- a/net-misc/dahdi/dahdi-2.11.1.ebuild
+++ b/net-misc/dahdi/dahdi-2.11.1.ebuild
@@ -76,6 +76,6 @@ src_compile() {
 
 src_install() {
 	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
 	rm -rf "$D"/lib/modules/*/modules.*
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2017-02-22 22:05 Michael Weber
  0 siblings, 0 replies; 25+ messages in thread
From: Michael Weber @ 2017-02-22 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     94b6b063e60dd41b4504b21c388df4997028548d
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 22:04:49 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 22:04:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b6b063

net-misc/dahdi: Add ~ppc ~ppc64 keyword (bug 447648).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/dahdi/dahdi-2.11.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-2.11.1.ebuild b/net-misc/dahdi/dahdi-2.11.1.ebuild
index d9cf22dde4..6612871f84 100644
--- a/net-misc/dahdi/dahdi-2.11.1.ebuild
+++ b/net-misc/dahdi/dahdi-2.11.1.ebuild
@@ -36,7 +36,7 @@ http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flash"
 RESTRICT="test"
 


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2018-06-08 12:36 Tony Vroon
  0 siblings, 0 replies; 25+ messages in thread
From: Tony Vroon @ 2018-06-08 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     544f094826762efc335dcfcf8392e07b0883894d
Author:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  8 12:35:55 2018 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 12:36:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544f0948

net-misc/dahdi: Address build failures on newer kernels

Reported by Toralf Förster; patches scavenged & rebased by Jaco Kroon.

Closes: https://bugs.gentoo.org/617876
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/dahdi/Manifest               |  1 +
 net-misc/dahdi/dahdi-2.11.1-r1.ebuild | 80 +++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 65b5b8e9a69..838cf87aff0 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -26,4 +26,5 @@ DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
+DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-2.11.1-r1.ebuild b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
new file mode 100644
index 00000000000..7f9b0c8baf4
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=1.2.4
+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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+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/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-01-10  5:43 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2020-01-10  5:43 UTC (permalink / raw
  To: gentoo-commits

commit:     dcbd5551044f0b23942cdf57265a724c5e5a0fa6
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Dec  6 17:27:00 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 05:15:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbd5551

net-misc/dahdi: version bump to 3.1.0

Fixes various build issues due to old kernels.

Unfortunately drops support for some cards previously maintained by
tzafrir (https://notabug.org/tzafrir/dahdi-linux-extra).  Unfortunately
by his own admission these are really old, and looks like he dropped
support for most of those cards as well.

If required, please file a bug against me and I'll see what can be done.

Closes: https://bugs.gentoo.org/661782
Closes: https://bugs.gentoo.org/661894
Closes: https://bugs.gentoo.org/679212
Closes: https://bugs.gentoo.org/679944
Closes: https://bugs.gentoo.org/701504
Closes: https://bugs.gentoo.org/701612
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/Manifest           |   2 +
 net-misc/dahdi/dahdi-3.1.0.ebuild | 104 ++++++++++++++++++++++++++++++++++++++
 net-misc/dahdi/metadata.xml       |   1 +
 3 files changed, 107 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 838cf87aff0..8c37cabb721 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -23,8 +23,10 @@ DIST dahdi-linux-2.10.0.1.tar.gz 2042867 BLAKE2B 221f9141e9d05c9322ff75857c32c64
 DIST dahdi-linux-2.10.1.tar.gz 2044847 BLAKE2B 242a3f440e0af7a006f2d96f2d9dd7d2e7095f795793301fc2d60e9c6e10124ad9c79e84c0917700dba74ee9cd4b2e49f81e23d7645532ca5af1b257f952c43d SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087
 DIST dahdi-linux-2.10.2.tar.gz 2044873 BLAKE2B 8c6bab0fb4b8436bb3b6f1f002e41fbd4269f5f64bbfe14519ae271c4cdd767a6898df771415960f5ead052f10a3aaff9ea1b67cc64b74da78020b8806ca9e1d SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537
 DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2c085655ee07c9637fbd09faf3e520beaa0f5a13e6864ba06e92bd1bb54b28e08c36f2b5d16dc9510ecae9ea61f745e3 SHA512 db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224
+DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
 DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
+DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.1.0.ebuild b/net-misc/dahdi/dahdi-3.1.0.ebuild
new file mode 100644
index 00000000000..acefda64fce
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.1.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=3.1.0
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+pkg_pretend() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	check_extra_config
+}
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
+}

diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index 5764b12a1cd..b132a89f1bb 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -11,5 +11,6 @@
   </maintainer>
   <use>
     <flag name="flash">Support (short) flash on FXS</flag>
+    <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-01-10  5:43 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2020-01-10  5:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a4cce513c14937aea6fc07283a18c0b32d22d060
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Nov 22 07:06:54 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 05:15:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4cce513

net-misc/dahdi: take maintainership

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/metadata.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index f804fe3a219..5764b12a1cd 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
+    <email>jaco@uls.co.za</email>
+    <name>Jaco Kroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <use>
     <flag name="flash">Support (short) flash on FXS</flag>


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-03-15 17:52 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2020-03-15 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8ad433d565136589746b85d094482e0fe6d78707
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Mar 13 14:13:02 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 17:51:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad433d5

net-misc/dahdi: rev-bump to re-introduce non-digium modules.

Closes: https://bugs.gentoo.org/705860
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/14944
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/Manifest              |   1 +
 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 104 +++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 8c37cabb721..3eefd9f34f4 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -28,5 +28,6 @@ DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c13885447
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
 DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
+DIST gentoo-dahdi-patchset-3.1.0-r1.tar.bz2 104172 BLAKE2B a4d1310ba7d8cd835f28ed2c4877c2aa6f5bf4870c4b3cf809921ebfcf99b2d2fa88d1a90ad7f0d9e84995340eb8468dcaa1399e28a00572b512ee8ad6061750 SHA512 940b295578fa0aef8480c031ea28c07f3dba6bfaf5a572dd23fc5d9f696509dcf95bb738990feaa554d0a72c28f88c9acae042679bca602d27ba1eb2805f9ef5
 DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
new file mode 100644
index 00000000000..f6c74472e10
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=3.1.0-r1
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+pkg_pretend() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	check_extra_config
+}
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-04-09 12:38 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2020-04-09 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     597ea5a7c16cb7b3ead096d54f78c9369cd41e7b
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Sat Mar 28 19:56:25 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 12:37:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597ea5a7

net-misc/dahdi: build fixes.

There were still some cases where specific kernel versions wouldn't
compile.  This now compiles on all versions that I've got.

Consolidated the patches for non-digium hardware (which is where most of
the issues were).

Added a patch for dealing with 64-bit division on PPC (works on amd64),
untested on ppc where it's required.  Will also affect ARM now - as per
newest keyword request.

Fix for systems without CONFIG_PCI.

Nuke empty RDEPEND= and DEPEND= lines.

Bug: https://bugs.gentoo.org/659488
Bug: https://bugs.gentoo.org/716426
Closes: https://bugs.gentoo.org/716226
Closes: https://bugs.gentoo.org/716468
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/15154
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/Manifest              | 2 +-
 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 3eefd9f34f4..53af155f1e7 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -28,6 +28,6 @@ DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c13885447
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
 DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
-DIST gentoo-dahdi-patchset-3.1.0-r1.tar.bz2 104172 BLAKE2B a4d1310ba7d8cd835f28ed2c4877c2aa6f5bf4870c4b3cf809921ebfcf99b2d2fa88d1a90ad7f0d9e84995340eb8468dcaa1399e28a00572b512ee8ad6061750 SHA512 940b295578fa0aef8480c031ea28c07f3dba6bfaf5a572dd23fc5d9f696509dcf95bb738990feaa554d0a72c28f88c9acae042679bca602d27ba1eb2805f9ef5
+DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
 DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index f6c74472e10..a37fb85b130 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic linux-mod toolchain-funcs
 
 MY_P="${P/dahdi/dahdi-linux}"
 JNET=1.0.14
-GENTOO=3.1.0-r1
+GENTOO=3.1.0-r1-v2
 S="${WORKDIR}/${MY_P}"
 
 JNET_DRIVERS="cwain qozap ztgsm"
@@ -41,9 +41,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flash oslec"
 
-DEPEND=""
-RDEPEND=""
-
 PATCHES=( "${WORKDIR}/dahdi-patchset" )
 
 CONFIG_CHECK="MODULES ~CRC_CCITT"


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-04-13 10:14 Agostino Sarubbo
  0 siblings, 0 replies; 25+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4f615c56286458cec8f67e4c1050caf7674655e7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 10:14:10 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 10:14:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f615c56

net-misc/dahdi: amd64 stable wrt bug #717228

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index a37fb85b130..22300e6f836 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-04-13 14:53 Agostino Sarubbo
  0 siblings, 0 replies; 25+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     e77ebed982b77a497b307d301298b89bc8726867
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 14:52:55 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 14:52:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77ebed9

net-misc/dahdi: x86 stable wrt bug #717228

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index 22300e6f836..bd1d6c11293 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-04-16  8:11 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2020-04-16  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     02c23378b148ef393f8bade6c95d3c599e7d7c89
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Sun Apr 12 15:32:54 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 08:09:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c23378

net-misc/dahdi: prune old versions.

net-misc/dahdi-2 (last stable) won't compile against any recent kernel.

Closes: https://bugs.gentoo.org/716914
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/Manifest                 |  13 ----
 net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild |  80 ------------------------
 net-misc/dahdi/dahdi-2.10.0.1.ebuild    |  80 ------------------------
 net-misc/dahdi/dahdi-2.10.1.ebuild      |  80 ------------------------
 net-misc/dahdi/dahdi-2.10.2-r2.ebuild   |  80 ------------------------
 net-misc/dahdi/dahdi-2.11.1-r1.ebuild   |  80 ------------------------
 net-misc/dahdi/dahdi-2.11.1.ebuild      |  80 ------------------------
 net-misc/dahdi/dahdi-3.1.0.ebuild       | 104 --------------------------------
 8 files changed, 597 deletions(-)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 53af155f1e7..ab159fa35b0 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -1,8 +1,6 @@
 DIST dahdi-fw-a4a-a0017.tar.gz 181429 BLAKE2B fb1285eb7d06c8bca5c91b421c408c7f494c05e4ccb89eb0703457059efef78f248a471e0d5ca03fdca97882531eb3b7e0c52e3231b7ef7a90b58c33882772db SHA512 e42cb83e05edb359949acd888a743c665d228cd3b9424fc8f3b60676d6799f4455e65cc269d1e2ac0e3bb5613607dad4fb37c433067832fb68b15bfddf6f4a2a
-DIST dahdi-fw-a4b-b0019.tar.gz 228785 BLAKE2B 623e1184b1e82f7232539f509f4bf83ecdba87d452502c81ad8b1ab6cfa4301425f4969f6fff31a6319e4d5cbe77b1e464c9e8b437689c9db6f874f069cd5423 SHA512 1c3be1f01f005bb7c315ffec42656a72d6a5f762806d39551ff0282b0f55e99744e9ad8a9b6da7cf0a384ad5ecbbf6430561466ad3a8a6e4a412ed870c69b218
 DIST dahdi-fw-a4b-d001e.tar.gz 239591 BLAKE2B f09c2ee17c9d14b95d5bc90de84cdb57a49c33d44e21c66b8ea29908d9ac58b979a0d0eb3cae80efc5e96de19226a850b2ca36aa2b462af66e02043bc8c3def1 SHA512 ab72cf6d469e44f3a8b9dda5e7acae9ae435b6f12b1491079155b8df4c9cf83aed48ccbda4acb4a9943dd6228846f5b82998a0bf575d454ac3b81b72c585d58c
 DIST dahdi-fw-a8a-1d0017.tar.gz 181958 BLAKE2B f7955ba62a94a1edd0c859e71c4f820ab789e098e2fd2c48e3fb453fee6ca5b056fe4144f83bd926f61e8f48fa223b84ce6912bf4a384ee9068fbe63538c1047 SHA512 2f80d24170f0efdebc318f238abb04664dfa97e3ca47a330b5a5e1d695c8ba5c535ad1302bf338667912b46cd5b4bbb76ab5bdbe6e736edd4f0e9239d818d05d
-DIST dahdi-fw-a8b-1d0019.tar.gz 228054 BLAKE2B 3d14966fc0732bacba3b152ebedfc03d23dc84ccb4deeb9abccadc3c1f9974e4135b8e0721965bc99ab681e46561691e757340c67b90c9fa05bbebdbe9ca79ac SHA512 d802b5e61e8ba2ddec1d86a26f11753d3cb627d9248df414d93595afac28e0257dad7313af5e721762ae309f34791a2e705d4fc357ef64eedb0c9369e133f79a
 DIST dahdi-fw-a8b-1f001e.tar.gz 236508 BLAKE2B 830cc01cc14eca0367e92e5d6dc10b019e42072da5a69b18095c52633d7dcddade920fd2cf2c43f101effc2319c43a803f433faad244e096fc9854d3d652da7a SHA512 68041e5cb53d8ff6beb9f667abca5a5a1c752357c224f5c7cfcb81732bd417671cf6dc03b5c5bafd6a0864f6c5451165c0f26908b0f40ed3408961f448f2a9a4
 DIST dahdi-fw-hx8-2.06.tar.gz 29252 BLAKE2B f3c635108032ff06b51a140f2f665a6a41638eb027d88c33822da9d47fe907eecfaab937ce6199f0d9eeeafbd36919366e039b0bc1a1be605c339055a8b6843b SHA512 d113d2bd10d5a851087e04fadb3427ec07634960d47e2292320f0d195c65075fb24ab173e0985c257eaf8e46f595f29af034fb380382cdbff7bfbc7381dff4ae
 DIST dahdi-fw-oct6114-032-1.05.01.tar.gz 165866 BLAKE2B 527d49f66924e91b6689cf905f365804be02707476d425e563db763bb158431f0e8bccc8ed38cbe3f4ec91747e53769ab5526cb3949218fc3b8041839796fcbc SHA512 ec47a7aac6a6abc73fe0c7ec3b31eebc868c516aeb1bb584f145f36c28abec21afa12dcec554bceb914c058c83255e32fb8d967ef4d8a5d0161b6053af464a24
@@ -10,24 +8,13 @@ DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 BLAKE2B 9b21e9a5a9bf85ac18db67b1
 DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 BLAKE2B 8621538d16e028eb2de64fa61c7475874525a302af5603f07a8a948a3c2cc1bd776feeeaf51c4d0c2edc4577156addc27905ecb06c9db6f43400258905cad6bf SHA512 17e83aa57ea8e9d3353027184adb48f664b177a528006d67112a53127fcb19c1011d4f44c2980ab77d27b3bf7f7a74d44f15aaf115e05fa3df8e16d3c30fc267
 DIST dahdi-fw-oct6114-256-1.05.01.tar.gz 171685 BLAKE2B 2f831da3043c6c73a4a38085d1c2b685acae94d92deba776e47a4d292f1ae65e5686ec3e8c73f0672ea8f390404717662f106b084083af4a8635447cd2f539fe SHA512 e447fe8d24963892339d895450cf7a04da3bdcf1de22630dea68119dbd9da84878478adf8ce0e5ef859e6d677c2a051aa6272de4e0692f5ce0e8b5d0fba4096b
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 BLAKE2B b16a2c77dc0222851af25a11e64e40f2648ec870444373ad2310b8b5157b2a2d5a4a4bf2850551758080e87f43371ff55a11f5f381bd08b060f5062f0faa7587 SHA512 88a986d22ead41a3dabc320e13f7a3e6e6ab9e2752aca2cc940ad9c1ec570d4f01e82c46d0ec1b6dc1a87a1df7e94cfb8aa638b44b4fe2254af8962f1fdbac86
-DIST dahdi-fw-te133-780019.tar.gz 229578 BLAKE2B a99e0e7a35ff1158946c1d2f0ee046f6284a9533c451ce40f89a33312e0e613ae980eab6dd79bedcf3fe5a3e043e8917c00fe365bafb90f7346e2b13251e452f SHA512 0883ec2607754d06b365a245234c6d6f4e1877ed54040c22534e144a153315e90c5657e2aa0e715f3f6899f9a54b653065fa0641c5c6b8c4efebc3b9d112305e
 DIST dahdi-fw-te133-7a001e.tar.gz 242987 BLAKE2B f6e5fedc742061b0ee26b33c20cb16a7a5efd68de827963dbb5fe3ddeed5bb491643e20818d39c8d0876ab3971c339ce43f03e97af3aff2286b70e020d2e05a4 SHA512 acd273bcf9b8e009b986e2c9f068121fad8b9cf8f500b79fd5456225ec4ef81d22f32960246a1e9b49ca7f47efb2f7d346c8727fe3b7b80c700d2dc609784acc
 DIST dahdi-fw-te134-780017.tar.gz 185478 BLAKE2B c301362e7433f9c3c9991ae50c0536ad4315fe966dced38fd2be7a9c3b01ce4829d4ecb8ef9756f4ad05b507bb4b6739a861264eb6975512ce8aa5b89b1ca14c SHA512 b6f93ff060512b15bb8462805d8f8a435e56a83be362770d2c3b39b876d2171c5e1e6c1bc42c893eaa382ccd2f19534536612618c4ef4ff8c25976cf3719d4fb
 DIST dahdi-fw-te435-13001e.tar.gz 238504 BLAKE2B c348a1e0d187ac4008254c78680dcd2b2ccce3f1af92bced190936c8ace88973e7d6854ed6de0480869ccd687d398958193ad90a648c8fe90464c3d1b5ddf974 SHA512 1cd5c191db62f87f87c9f6913bcbc3ed9f3d77a51578cd0bc5fdb9d17e128bcaf66d04c5a9e6417e9d7543fc8f18b6f635f0e8c1cb1bc19b11bc8ddffaa6be08
-DIST dahdi-fw-te435-e0019.tar.gz 231242 BLAKE2B 0cc6c4b8a4384d49561905c386887a31ccc4c61c742826eeceaec25282dfa1dffba97aa1689041d2b158e1182da316a56f1c3703e9285f8bafd23e4f89d59de2 SHA512 ccbc4fbc184704ca3ea12311b1d4f719330321773a9480d731c5fb669a37166d10aa6e704d363bb0a41d9bde6bf119b3e7bd4072ab49b864fea6391b429f99bb
 DIST dahdi-fw-te436-10017.tar.gz 210601 BLAKE2B 8aceaa093b457a374db89599779315458a91af3d6f58e74a35ee08d3c91a556b64f78244a9e3e05d9bc8b200be2b3be83d159eb85681f3afb20329f16b2f2445 SHA512 56e8a26a737ac45e137324b635e5f489fe05a5939324af038f881b64ddabf486eb3830ff0ada1561ffedb3d6bc8338b11f4dccbc9b2ca9e00cd2bcc85abf83c0
 DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43dd21170fc16669de064e92615e5b049cf5cdf49f9c9d03d9e795172eafad83cd3b0636fb1491df5612358757a2e9d5 SHA512 3189df3dd680353d5520773ac8ea7fe638ea05e3c656379c1a245bd3ab8a6ae0c8a1c22c2068be9c758996e5993b0d19376b159b4e868ebc3d817dcce3b9aec7
 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
-DIST dahdi-linux-2.10.0.1.tar.gz 2042867 BLAKE2B 221f9141e9d05c9322ff75857c32c64925c685965b30911efa93777b3487d0a11d15c14a1e340b41e8db37880bed06ec998477e8a806f4627bdb71450b29c38f SHA512 7d03717947063a037e83fc13ab42e4ecc4aeb12a2d8e1f0cae5b491d2dcd948aa51381f0111e5013f355faf4d6ff00df8238e19be91852e99040a836fbf51318
-DIST dahdi-linux-2.10.1.tar.gz 2044847 BLAKE2B 242a3f440e0af7a006f2d96f2d9dd7d2e7095f795793301fc2d60e9c6e10124ad9c79e84c0917700dba74ee9cd4b2e49f81e23d7645532ca5af1b257f952c43d SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087
-DIST dahdi-linux-2.10.2.tar.gz 2044873 BLAKE2B 8c6bab0fb4b8436bb3b6f1f002e41fbd4269f5f64bbfe14519ae271c4cdd767a6898df771415960f5ead052f10a3aaff9ea1b67cc64b74da78020b8806ca9e1d SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537
-DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2c085655ee07c9637fbd09faf3e520beaa0f5a13e6864ba06e92bd1bb54b28e08c36f2b5d16dc9510ecae9ea61f745e3 SHA512 db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
-DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770
-DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
-DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
-DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
-DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild b/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild
deleted file mode 100644
index 24e2e57ed3c..00000000000
--- a/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.2.0
-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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-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/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	base_src_prepare
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-2.10.0.1.ebuild b/net-misc/dahdi/dahdi-2.10.0.1.ebuild
deleted file mode 100644
index c139e5feaf6..00000000000
--- a/net-misc/dahdi/dahdi-2.10.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.1.9
-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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-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/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	base_src_prepare
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-2.10.1.ebuild b/net-misc/dahdi/dahdi-2.10.1.ebuild
deleted file mode 100644
index c139e5feaf6..00000000000
--- a/net-misc/dahdi/dahdi-2.10.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.1.9
-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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0019.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-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/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	base_src_prepare
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild b/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
deleted file mode 100644
index 4278be9bd69..00000000000
--- a/net-misc/dahdi/dahdi-2.10.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.2.3
-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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-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/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	base_src_prepare
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-2.11.1-r1.ebuild b/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
deleted file mode 100644
index 7f9b0c8baf4..00000000000
--- a/net-misc/dahdi/dahdi-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.2.4
-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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-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/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	default
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-2.11.1.ebuild b/net-misc/dahdi/dahdi-2.11.1.ebuild
deleted file mode 100644
index a5e7bbf3892..00000000000
--- a/net-misc/dahdi/dahdi-2.11.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=1.2.3
-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.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-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/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
-	cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	base_src_prepare
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" LDFLAGS="$(raw-ldflags)" install
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-3.1.0.ebuild b/net-misc/dahdi/dahdi-3.1.0.ebuild
deleted file mode 100644
index acefda64fce..00000000000
--- a/net-misc/dahdi/dahdi-3.1.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=3.1.0
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flash oslec"
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-pkg_pretend() {
-	use oslec && CONFIG_CHECK+=" ECHO"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		[[ "${file}" = dahdi-fw* ]] || continue
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
-			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
-		die "Error moving firmware files into the right folders."
-
-	for drv in ${JNET_DRIVERS}; do
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.c from jnet to DAHDI."
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.h from jnet to DAHDI."
-	done
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
-			die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
-			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	if use oslec; then
-		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
-			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
-	fi
-	default
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" install
-
-	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-06-25 11:18 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2020-06-25 11:18 UTC (permalink / raw
  To: gentoo-commits

commit:     e218181a346d02f68e92267d94f299319104d3b6
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Thu Jun 11 19:59:13 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 11:18:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e218181a

net-misc/dahdi: fix install issue w.r.t. depmod.

If the kernel sources are not yet compiled, then there is no System.map,
and as a result the kernel build system won't run depmod, resulting in
the modules.* files normally generated by this to not exist.  This
causes the rm in the ebuild to fail.  Substitute with a find mechanism
that only deletes if it exists.

At the same time clean up some empty files on the image that carries
firmware version information which we don't care about.

Closes:  https://bugs.gentoo.org/725022
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/16196
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index bd1d6c11293..f69efcbe418 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -97,5 +97,11 @@ src_install() {
 		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
 		LDFLAGS="$(raw-ldflags)" install
 
-	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
 }


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-07-15 17:42 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2020-07-15 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0c0b75190b716e3a3bf222baacfb6d15ec39213d
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Wed Jul 15 17:08:14 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 17:42:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0b7519

net-misc/dahdi: Add CONFIG_PCI as kernel config requirement.

Picked up by Sam <sam <AT> gentoo.org> whilst working on:

Bug: https://bugs.gentoo.org/716426
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/16708
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index f69efcbe418..544cdbddd16 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -43,7 +43,7 @@ IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )
 
-CONFIG_CHECK="MODULES ~CRC_CCITT"
+CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
 
 pkg_pretend() {
 	use oslec && CONFIG_CHECK+=" ECHO"


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-07-16 17:45 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2020-07-16 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     5708a11dd1b7a04974c08b4485636913e07a63f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 17:44:25 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 17:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5708a11d

net-misc/dahdi: arm64 keyworded (bug #716426)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index 544cdbddd16..8f9ab48a6f5 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-07-20 12:24 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2020-07-20 12:24 UTC (permalink / raw
  To: gentoo-commits

commit:     14bde9f433fedfb2e4a0fa3f9005428db1d28586
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 12:20:48 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 12:20:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bde9f4

net-misc/dahdi: arm keyworded (bug #716426)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index 8f9ab48a6f5..1bde322e9f4 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2020-08-08 12:18 Mikle Kolyada
  0 siblings, 0 replies; 25+ messages in thread
From: Mikle Kolyada @ 2020-08-08 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     05b388d113a1ed6cc377454de211667c485a9cfb
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 11:11:14 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 12:18:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b388d1

net-misc/dahdi: migrate to sys-apps/kmod

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-misc/dahdi/{dahdi-3.1.0-r1.ebuild => dahdi-3.1.0-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r2.ebuild
similarity index 100%
rename from net-misc/dahdi/dahdi-3.1.0-r1.ebuild
rename to net-misc/dahdi/dahdi-3.1.0-r2.ebuild


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2021-01-22  6:35 Joonas Niilola
  0 siblings, 0 replies; 25+ messages in thread
From: Joonas Niilola @ 2021-01-22  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c3b3b4a73fe525c228f3b60727f59ffc0b7ca1aa
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Jan  8 12:02:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 06:35:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b3b4a7

net-misc/dahdi: version bump to fix compiler problems.

1.  clang/LLVM
2.  Kernel header changes (5.9 onwards)

Three additional patches added to the patch set (two of which from
dahdi-linux/next, and one just submitted):

09-dahdi-3.1.0-r3-remove-32bit-userspace-on-64bit-support.patch
10-dahdi-3.1.0-r3-ioctl-kernel-5.9.patch
11-dahdi-3.1.0-r3-clang.patch

09 is a dependency for 10, which is required since kernel version 5.9.
   The former seems to affect 32-bit userspace on 64-bit kernels only,
   and according to upstream there are no tests for this.

10 fixes the compile issues for kernels 5.9 onwards (which dropped ioctl
   from proc_ops structures.

11 imports clang fixes as per https://issues.asterisk.org/jira/browse/DAHLIN-385

Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://bugs.gentoo.org/748240
Closes: https://bugs.gentoo.org/740818
Closes: https://github.com/gentoo/gentoo/pull/18990
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/dahdi/Manifest              |   1 +
 net-misc/dahdi/dahdi-3.1.0-r3.ebuild | 107 +++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index ab159fa35b0..fd12a6dd7e2 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -17,4 +17,5 @@ DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
+DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
new file mode 100644
index 00000000000..6a86455478f
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod linux-info toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=3.1.0-r3
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
+
+pkg_pretend() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	check_extra_config
+}
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2021-03-12 18:35 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2021-03-12 18:35 UTC (permalink / raw
  To: gentoo-commits

commit:     65aef7ccd1bdaed3af528c070823ecfbf08910ee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 18:33:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 18:33:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65aef7cc

net-misc/dahdi: Stabilize 3.1.0-r3 amd64, #775341

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
index 6a86455478f..bb776d1fafc 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2021-03-26  7:50 Agostino Sarubbo
  0 siblings, 0 replies; 25+ messages in thread
From: Agostino Sarubbo @ 2021-03-26  7:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f7bb8ee93e2283485ecaa4feca06ae134af3102e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 07:49:03 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 07:49:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7bb8ee9

net-misc/dahdi: x86 stable wrt bug #775341

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-misc/dahdi/dahdi-3.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
index bb776d1fafc..5dc1b0089be 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2022-06-30 21:47 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2022-06-30 21:47 UTC (permalink / raw
  To: gentoo-commits

commit:     6d1f4088f1bfa1c60b9ec54663a352c89d088177
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Jun 10 07:18:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:46:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1f4088

net-misc/dahdi: 3.1.0-r4

This fixes a few reported bugs, and re-introduces some drivers that was
dropped from upstream, which someone mentioned to me could still be
useful, but I can't recall whom nor can I find references as to where,
but seeing when I pushed -r3 this was plainly in the pipeline I pushed
forward on that.

Closes: https://bugs.gentoo.org/832587
Bug: https://bugs.gentoo.org/834640
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/Manifest              |   2 +
 net-misc/dahdi/dahdi-3.1.0-r4.ebuild | 120 +++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 69792b91e8f9..716cde8c9cc2 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -16,5 +16,7 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43
 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
+DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157
 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
+DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
new file mode 100644
index 000000000000..05ae21da55a6
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO_PATCHVERSION=3.1.0-r4
+GENTOO_SOURCEVERSION=3.1.0-r4
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
+
+CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
+
+pkg_setup() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	local file drv
+
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+
+	# Find the stuff from gentoo-sources (ie, modules that has been removed by
+	# upstream and we're re-adding).
+	DAHDI_GENTOO_MODULES=""
+	for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
+		[[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
+		[[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
+		mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
+}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2022-06-30 21:47 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2022-06-30 21:47 UTC (permalink / raw
  To: gentoo-commits

commit:     b418fdb9f6a6eb6946f9a6e5ed7dec094c47e65c
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Fri Jun 10 07:04:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:46:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b418fdb9

net-misc/dahdi: purge 3.1.0-r2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/Manifest              |   1 -
 net-misc/dahdi/dahdi-3.1.0-r2.ebuild | 107 -----------------------------------
 2 files changed, 108 deletions(-)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index fd12a6dd7e2b..69792b91e8f9 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -16,6 +16,5 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43
 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
-DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild b/net-misc/dahdi/dahdi-3.1.0-r2.ebuild
deleted file mode 100644
index 1bde322e9f43..000000000000
--- a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=3.1.0-r1-v2
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_pretend() {
-	use oslec && CONFIG_CHECK+=" ECHO"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		[[ "${file}" = dahdi-fw* ]] || continue
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
-			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
-		die "Error moving firmware files into the right folders."
-
-	for drv in ${JNET_DRIVERS}; do
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.c from jnet to DAHDI."
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.h from jnet to DAHDI."
-	done
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
-			die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
-			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	if use oslec; then
-		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
-			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
-	fi
-	default
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" install
-
-	# Remove the blank "version" files (these files are all empty, and root owned).
-	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
-	# If the kernel sources have a System.map, and there a suitable depmod
-	# available (seemingly when we're not cross-compiling), then the kernel
-	# sources depmod kicks in.  Remove the files caused by that.
-	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}


^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/
@ 2023-05-12  3:53 Sam James
  0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2023-05-12  3:53 UTC (permalink / raw
  To: gentoo-commits

commit:     069bd8848f9792e74c67268e9302e84d2acceabf
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Thu May 11 14:18:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 12 03:53:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069bd884

net-misc/dahdi: add 3.2.0

Closes: https://bugs.gentoo.org/896396
Closes: https://bugs.gentoo.org/855554
Closes: https://bugs.gentoo.org/871363
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dahdi/Manifest           |   3 +
 net-misc/dahdi/dahdi-3.2.0.ebuild | 120 ++++++++++++++++++++++++++++++++++++++
 net-misc/dahdi/metadata.xml       |   3 +
 3 files changed, 126 insertions(+)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 716cde8c9cc2..856dd7fb9c7e 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -16,7 +16,10 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43
 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
+DIST dahdi-linux-3.2.0.tar.gz 1617958 BLAKE2B 1a35ba69719e7cebf7cf471f901a3280e1558b8e8e4f615fcc974a08a83f62e71ee653b47f3a09e85e96a0447e4516996ef254497746492fe50eebef5515e217 SHA512 cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072
 DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157
+DIST gentoo-dahdi-patches-3.2.0.tar.bz2 6947 BLAKE2B 8e4d2245d966a14c6eec7045c74788decc52c5dec562e7d09670766f169e6890a7fae2bf245ab198276780210564e891fe5d16b6e0d44ff5be876f218c23f2fb SHA512 c47a092d17abb0070cebfae540363a01bb8a9927e05524c3d50e76d69249115b3caf83d436469153b7a519e6c6952baab14d6bf898a440373f90d02359fbb4ae
 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
 DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762
+DIST gentoo-dahdi-sources-3.2.0.tar.bz2 87595 BLAKE2B 18a2f007581ac653e0a1a50c77b36b0b2065e1dfd5c32ffe754cbb66b7aaf6df52dc4f856f8a9e0440f6ecf193c56e7506db24ab2b0ede43d9a1185ef84e0036 SHA512 4f13597914427f2e6cea08c6dce9e9bedf5d35a62c8d5dc545e8fb1268ffeb5dece84a27c2a50a8d55a7b8eda1d4fe2bfe18465b0492b45a3684170c5a600072
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66

diff --git a/net-misc/dahdi/dahdi-3.2.0.ebuild b/net-misc/dahdi/dahdi-3.2.0.ebuild
new file mode 100644
index 000000000000..8b59341edcee
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.2.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO_PATCHVERSION=3.2.0
+GENTOO_SOURCEVERSION=3.2.0
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
+
+CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
+
+pkg_setup() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	local file drv
+
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+
+	# Find the stuff from gentoo-sources (ie, modules that has been removed by
+	# upstream and we're re-adding).
+	DAHDI_GENTOO_MODULES=""
+	for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
+		[[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
+		[[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
+		mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
+}

diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index 55eff7ad9e4b..2bd89c9cbc5a 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -13,4 +13,7 @@
     <flag name="flash">Support (short) flash on FXS</flag>
     <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag>
   </use>
+  <upstream>
+    <remote-id type="github">asterisk/dahdi-linux</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2023-05-12  3:53 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-30 21:47 [gentoo-commits] repo/gentoo:master commit in: net-misc/dahdi/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-05-12  3:53 Sam James
2022-06-30 21:47 Sam James
2021-03-26  7:50 Agostino Sarubbo
2021-03-12 18:35 Sam James
2021-01-22  6:35 Joonas Niilola
2020-08-08 12:18 Mikle Kolyada
2020-07-20 12:24 Sam James
2020-07-16 17:45 Sam James
2020-07-15 17:42 Sam James
2020-06-25 11:18 Joonas Niilola
2020-04-16  8:11 Joonas Niilola
2020-04-13 14:53 Agostino Sarubbo
2020-04-13 10:14 Agostino Sarubbo
2020-04-09 12:38 Joonas Niilola
2020-03-15 17:52 Joonas Niilola
2020-01-10  5:43 Joonas Niilola
2020-01-10  5:43 Joonas Niilola
2018-06-08 12:36 Tony Vroon
2017-02-22 22:05 Michael Weber
2017-02-22 22:03 Michael Weber
2017-02-22 21:02 Michael Weber
2016-03-31 10:54 Tony Vroon
2015-11-01 13:47 Mikle Kolyada
2015-10-27 12:18 Agostino Sarubbo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox