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@uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/15154
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 3eefd9f34f47b688880deffdb0c6f3e86db69dc2..53af155f1e7336b9579623ea109e96db41d761e7 100644 (file)
--- 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 f6c74472e10713d4c5d9b95cc7a2ac648969e2c2..a37fb85b13031952a6fd08307eac555b82f6bb09 100644 (file)
--- 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"