Use a patch to fix build makefiles, as the sed was not good enough. This actually fixes both sides of bug #413989 (build failure with --as-needed and missing failure to make).

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 92 insertions, 49 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index a6dbfddbe55b..406514188f6c 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/maradns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.52 2012/06/14 02:13:48 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.53 2012/07/11 11:00:14 flameeyes Exp $
+
+  11 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/maradns-2.0.06-build.patch, maradns-2.0.06.ebuild:
+  Use a patch to fix build makefiles, as the sed was not good enough. This
+  actually fixes both sides of bug #413989 (build failure with --as-needed and
+  missing failure to make).
 
   14 Jun 2012; Zac Medico <zmedico@gentoo.org> maradns-1.4.09.ebuild,
   maradns-1.4.11.ebuild, maradns-1.4.12.ebuild, maradns-2.0.06.ebuild:
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 62b88ad7f493..050814a510a3 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX deadwood 578 RMD160 c4423aca83b9979a21db0edc811122c26e41c2f3 SHA1 6964f587d78a2f8751fd3a71b504e5cd91bb64b7 SHA256 2e5c3ec39be791b0e886fb7fbae19e72e9fff0161dba7d4abefd2b2f3a54cdbc
-AUX maradns-2.0.06-askmara-tcp.patch 7330 RMD160 757085630006f9661d7aea4d4a80fd185c3c1d48 SHA1 b5c4e7bb4ae86d0b01fe915af291c94779c0b2a5 SHA256 b5b8f8acb732d2d85667557861c500bcb50d75dcc2213686ebd7a382299f57b6
-AUX maradns-2.0.06-duende-man.patch 3393 RMD160 2d7fdac0800d3de34a77d50a56883f74b6afe61b SHA1 e2014b8607b66dd69ec46f7e83cabea24be8099e SHA256 ae68fb3f32c7d02267d8dbf187d9d358051b547499aa0fa3b97ae031ce4ec569
-AUX maradns-2.0.06-groff.patch 12169 RMD160 2fb89b915132582ffabf77f873b95c2ba186ac3f SHA1 56893e99bc6aa3138c039c3abc2aded9477306e0 SHA256 b0294ba1aeca47836a2510e1b5fe03c7c8c626ef0c73260aa72916214305aff4
-AUX maradns.rc6 538 RMD160 ee8d8a4dc3e91b62dd1b88cfc82989ec57e56985 SHA1 ecc0ce0ee82b70d813a586f4e2b58195a9c7add0 SHA256 78a621eb5c47592020640e38ddad366167a76806d252daafe9603a12fc8a27fe
-AUX maradns2 584 RMD160 61057ca31264a96eec1a40c15ca9f3953a4de451 SHA1 db2f19a93dc13a9f740ad75974d496578b9752f7 SHA256 06c1f9ee60a9c7fa8b533c877c8060fff7d1ad6b528fa5c8183c48e6fcc1c0a3
-AUX zoneserver.rc6 515 RMD160 1a48fb994355f048dfd3bd4297f0ba4ffb2c83f1 SHA1 8efaeb8cfeae5560a7a8289f3a48c3ede8cecdf0 SHA256 fbc913978337963ed55a33e825d8746f6e8bab31ffa22c6020102b78b2838b25
-AUX zoneserver2 589 RMD160 3829f47f807f650d11fa3e7d0bacea3c9dde05e5 SHA1 757cafaa232b0fadcf8f9623511932c86b3063a7 SHA256 2c5159d7dfcff8fe97c09b671474497b0f348ffe5cc9e5eb301e77f3c82c1480
-DIST maradns-1.4.09.tar.bz2 1120532 RMD160 7db8814babc0544e892dded04e9dd26027f8b44a SHA1 e6ff8bc9699db3b13804c08373691d3b47a779ea SHA256 83af8e7eb04635ff6a5b57dd61285e1f08f60017d8dafb397389eb8527125003
-DIST maradns-1.4.11.tar.bz2 1178524 RMD160 2b02af17e9645f1870b7708cefbd45a8774911bf SHA1 53dbac26d5b14325b9227274bd282b3746c3d8e2 SHA256 709dee65b9b01c8be1d1e18646b79ddc57d2f343528e03fd220e9079678fac11
-DIST maradns-1.4.12.tar.bz2 1178772 RMD160 34d9112c7e14782f4ed3e2bba070af82c7389a65 SHA1 7198e3292c199a9ec3e831f76f96c25ad6a86956 SHA256 72c0e0fd10e4d9ed70d8c7addb9b0abd2cf2d23f6b477db3aefd69c9faa0893b
-DIST maradns-2.0.06.tar.bz2 1056637 RMD160 af92be523d2658b598a4c7bd192a189c6e9294a5 SHA1 5f386c5c9bed371e3fbc7130c4109676684e12ba SHA256 2311cf08b0fca85357022b7dd180104a83f40e88d5873049d0a9225baca70388
-EBUILD maradns-1.4.09.ebuild 1984 RMD160 cc7823879571f398dfce043835f18e8778131283 SHA1 de29082bbd20a8c2dbf75f870b279a5bdc015c5d SHA256 848bb5c523a22ca936760f687c3a099612bca234fe23f5f4777d31c12415b045
-EBUILD maradns-1.4.11.ebuild 1975 RMD160 5985b7e6be9d20a57ea8dd8862552797cb41407e SHA1 66563171e31a473e3efe2fa7b74dd5bd05fe9e72 SHA256 a9f75f6225f97473e05162924f5dedac1dba19bab7e7f5fe694472d9ff9a2894
-EBUILD maradns-1.4.12.ebuild 1972 RMD160 a21fa2d2fbf702314ed56bf28514b21d5b70e519 SHA1 772334486641144e35056d2b4d7d8ba69b8de50b SHA256 d5f4b9468345b6dfd0a3cc3fdc9228912e00207e377957e0245563a290642730
-EBUILD maradns-2.0.06.ebuild 3397 RMD160 e867de7a17c5f14af0f52603c722855fa79643b3 SHA1 9a9d2729ef342593d5ad8223873a2765f9c748df SHA256 5af9f352defc04cdaeaa1dd722e1b2115247fb122248cbc0825cda6e804572ac
-MISC ChangeLog 7950 RMD160 a79cbe815dfdf7b3423d10dcbe082ad3c8585c5d SHA1 74fe25d012e8aa6a860a297051aa63f5c4f84db5 SHA256 4a4ff1ff12fe58a35403461e54e89b4497f1320a7cfcf39a816dd5804a380675
-MISC metadata.xml 295 RMD160 2a7fc127a3051d8907fd33eb748cbadc9dfdd67f SHA1 086f03d3b2d5c085390d84c8b023801679252f6a SHA256 a325dc3d4f57d01ef2414651a2bead82ca694dc881849b97e9bf078de3c7b416
+AUX deadwood 578 SHA256 2e5c3ec39be791b0e886fb7fbae19e72e9fff0161dba7d4abefd2b2f3a54cdbc SHA512 8c171cbfb25bc9c2a87b7917caff47a3842ce9dba232ac2cb7313abbe658c6fbebfb2a7025a7e3965c8d46cbb3e2c46b3a76df48a091d1a9fc4d66728b31f8f1 WHIRLPOOL 9aabcef89d65612b760effc692996b0dee3ba5bd56cdbcf0ef94998fc55e9c3e8a61b2f5a107d0bce0a27e48c1ed0ca034d84820c66a67bc15257a0d87c2c25f
+AUX maradns-2.0.06-askmara-tcp.patch 7330 SHA256 b5b8f8acb732d2d85667557861c500bcb50d75dcc2213686ebd7a382299f57b6 SHA512 0a36bbe9fbf8d48e6e1e20cc6045656f3517f650bc055b1abecdac4e2eb2e0f4c0f41ed960913ec38590f76a16762a518ca3f20799b8ee64223530da5b2d0dee WHIRLPOOL a88b27c61e3a36348ccaff66488638a04921303c5911283ec19970d6facd86cd4d07d8e9cd66f41d8c0bdd766b90871e85cf7ea4b2c62ab1eb4f51d680858284
+AUX maradns-2.0.06-build.patch 2073 SHA256 79869085abed8f53c5c0a1367555da1126ffaa36917d38ffe80d406cf5295dff SHA512 0bbb2e6be1bb0428146664719be28973a5c3ef171f0d66e04a32a8c72b06fce6bbd6ccbf14340e4a676884023eeda23271a2f33fa11b23b2d420dc42026bf2c5 WHIRLPOOL 1f3614b1c17f98332ee0e949ceac1cf2ce1f4e015dda7c2a084566c79ee4198b96a6775ee61f619fb759cfdcce1a93f62a5df92b27f9a48f1f65276dff2a5485
+AUX maradns-2.0.06-duende-man.patch 3393 SHA256 ae68fb3f32c7d02267d8dbf187d9d358051b547499aa0fa3b97ae031ce4ec569 SHA512 ff4996e9b377fe01d90f36bf306085e981e1b00bb6264e69e04f9bc53271d98201ec84ea773630453840b357fdf2d3aa46c48fb3af3812cb97627a66fa77bc58 WHIRLPOOL 97b8029491a5abc434a99e6e4f030339c302e1a3c1ddbc6548a5c2c6f883de1986eff82acde310168937ecda2b7ddb9ded04b2b5200cd3e3f710eaf5902c6792
+AUX maradns-2.0.06-groff.patch 12169 SHA256 b0294ba1aeca47836a2510e1b5fe03c7c8c626ef0c73260aa72916214305aff4 SHA512 b4123a4c9313126bfb777891d2bb9b746cd87e67620c6d529fe298fb9834ff4d2043c5bde34a57097840d8430bb8ccb354f3e8d85183188d9367130c6d407e52 WHIRLPOOL dfac9a5bd5c3cf4974af9fce5a6d29f47153639ec2b0064f77c02f835779193f38cbacd74a1c28741d46c5b7c25aed7350c4f6cabc4aae06a4db48246970bfb0
+AUX maradns.rc6 538 SHA256 78a621eb5c47592020640e38ddad366167a76806d252daafe9603a12fc8a27fe SHA512 a8387275a1c9155b93e32d43ecb499e051cf43a2c34413f59c6c05b687721f17a489b16e707f64b0943f6c331b5a5e468e6d4ec89d4468cd97697389d8fbd204 WHIRLPOOL b4cfd3813011009ffedc6e21b2619193fe939dee58a5927695ae8e582b21961f9cccf2b6144501bd3ba75753bbfe76f6c8aebe54528f7032b0f5c250cfac6e0a
+AUX maradns2 584 SHA256 06c1f9ee60a9c7fa8b533c877c8060fff7d1ad6b528fa5c8183c48e6fcc1c0a3 SHA512 b0cf9868df45681d64b6a31d171f2c1062a68f495d39cc65bdcb8106ed451d049daf3e2a695d34ec393769daa90e62ea8fef6089620c35878c7cca26376ce82d WHIRLPOOL e5949ef7efe60b8bca56d583dc9f194a32e2af5857fbea1cbd1aaff8c8b322739e0cf38f501ffb6f836de4d98c2e32eabf579cec9e08475c7a7edbace16b3682
+AUX zoneserver.rc6 515 SHA256 fbc913978337963ed55a33e825d8746f6e8bab31ffa22c6020102b78b2838b25 SHA512 504fa614e0b6b9338d8bea8a1f3f27771bc5aa30a5bdb2f69e9ac3c6ef8a0e061867b70cc76d14f94ce14afba26cff7103107189fc0b51e2e3daf5e8251981a7 WHIRLPOOL 09968fee4cf1b591ebc9d216b52cc3b0eced62f02d9b365e1bd3f548fa0aaf0eb9774547937d0671d624aa7092444c8ee3760104cbf8068e990af1778c74c8cf
+AUX zoneserver2 589 SHA256 2c5159d7dfcff8fe97c09b671474497b0f348ffe5cc9e5eb301e77f3c82c1480 SHA512 e5e807498dfe450242d46825e8bdf4de8ba15dc0f0566e7c3f311f75a8b4a76da77851cc37951fe9f6a1f9ddcb1c8266228619e1ba386de1be5e409dfa65fb21 WHIRLPOOL 29b9d8e402e7f583bf0c628a37e1874ca103532ea1e7fe23d454c93500db4052f1db2620a384577154ccff87d2833ee0d6e751c46f0857c298a5309864c267a5
+DIST maradns-1.4.09.tar.bz2 1120532 SHA256 83af8e7eb04635ff6a5b57dd61285e1f08f60017d8dafb397389eb8527125003
+DIST maradns-1.4.11.tar.bz2 1178524 SHA256 709dee65b9b01c8be1d1e18646b79ddc57d2f343528e03fd220e9079678fac11
+DIST maradns-1.4.12.tar.bz2 1178772 SHA256 72c0e0fd10e4d9ed70d8c7addb9b0abd2cf2d23f6b477db3aefd69c9faa0893b SHA512 62bf17c4c6df856b44ade37d3f3e99d6a51a3a54ad66000ef180bec202b47311d6e13d2811a8abc24ac837e7749bbfa35a516c035c6d5dd590cd96d454b8ddd6 WHIRLPOOL 61935871fcff4f6075d19272c724ac8224074d3c3c3def121d006a0201c8849a4cc41efff954d4a75a00a4cbb94d3ce84f9ade7bd92c99aef8afcc8b5d65c5b3
+DIST maradns-2.0.06.tar.bz2 1056637 SHA256 2311cf08b0fca85357022b7dd180104a83f40e88d5873049d0a9225baca70388 SHA512 cee03cb03b2e846f25e93e113a886c514bef59f5acfe2d9dd55fcd911161fb9712b8dc693a248d55f33eb7a823ac9794d277716e002e9dcd56280c576470d9e0 WHIRLPOOL 9106dba81b838949314f3c6a5ada95189e1d0de4a0b6138cfbc354aaefdca1b0ad46c022758df554a33653ce4beea9822f6b03e8fe358351ef68f56d97c0f2b4
+EBUILD maradns-1.4.09.ebuild 1984 SHA256 848bb5c523a22ca936760f687c3a099612bca234fe23f5f4777d31c12415b045 SHA512 3ae91e4df608324ce9fff3e82791d5948e5510eafee978c54277134237b2ee92fccdb6da6e51b5db51cb41b234e1216077de5c05dc21336dc25d725e350c1688 WHIRLPOOL 3f75c108d2b3939112e8037c7935114d177f5a25a80b40af60a8d82b08317493ef5a73f5031db62b9f15e97000acd9b324807e2bec5606e950d92d2d33c98cdc
+EBUILD maradns-1.4.11.ebuild 1975 SHA256 a9f75f6225f97473e05162924f5dedac1dba19bab7e7f5fe694472d9ff9a2894 SHA512 596fb8d34a6db4ba077e8ffd26b242f229e5faab61998c1d247b91cc476115ff3896d262fb62d5349252900d71101db75edda9c5305843b841b1aa7240f572d9 WHIRLPOOL 8ca10d39f37ca70b51a4fedeb3b77869d207bef7f8f317a4284b4f01fd01746f9d48c37b64d6b9b73ced2312947424390cf28ff497edf14711147ad5fcc2b9dc
+EBUILD maradns-1.4.12.ebuild 1972 SHA256 d5f4b9468345b6dfd0a3cc3fdc9228912e00207e377957e0245563a290642730 SHA512 5f4fa62624fee3488369ee32b791564c0cf83d8ab34cc16da8df22d84d0acd98fc562afac9a8a9861892b390de8faf940d38d2b05b65cc1102bc86f4ddb2f741 WHIRLPOOL 96b3b8d58f19dadbe0a721ac545ef96c91e07a41d7b648f53aa31ceacff524225dbef27b8a997afefb8547d69381bd1e4949af3a769ff196e2498746f3c2c146
+EBUILD maradns-2.0.06.ebuild 2477 SHA256 ab65b6535abd677e63f7ed49da40d55f8da715a93cf0fc40133e71ea57d16fe1 SHA512 84eaaa1fea9a11b727744be8224a0b95a7d861f5a910c9867b2b5f7a4af77f99f49ff9fc4c0ca84a02b47b95abddeb3296ec19c60bad386d82c0b688120aa27e WHIRLPOOL afe8a66adc19d6b7c4c9c42c611982d7d2ec0c3e751615d6420c9508859169b156b8cb4f5b615296c70b7d5bccf6437272080f5d372044e7cb53732c52c386ec
+MISC ChangeLog 8251 SHA256 b23f2aa2e200428a8c4d9aecfc00e9e5b0d224d576450ce0a423e0b2907f03b9 SHA512 ddd76126e073deee31d797cd4fbcb2e20650193470f509baa421a99d1340c1b93a41cddc9cccb52f6a2281968de82c718e80500b53888b6edaf6b86820e58c40 WHIRLPOOL 9e572ea9237d5b6906a273113fb79f9be76811c987db60e7f10e4a51d9849a613f1f66ed974a48f06f7a3f76ee795a19dc9e6d0cfc26a710028a75f7e24cbf29
+MISC metadata.xml 295 SHA256 a325dc3d4f57d01ef2414651a2bead82ca694dc881849b97e9bf078de3c7b416 SHA512 8cb741d9f1754ce17dd2b53d69800e74907240365cb0a8e74c6d8aea19b087dd0d76fed56ebcdb7ab075b8213332be9fb14886b2e9c8c7f225e2664a1eec0d16 WHIRLPOOL d5b13463e2f38adb9a70d944e90b6db718821ee82877e2ca9221ad3069f5ef4b33443f2af7540c0ec96491808181f31e438593f803b6c309984a9a29fbf2486d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/ZSOMACgkQ/ejvha5XGaNuMQCg8Ue73GVDSkzGJNgJnhQUgZnn
-/2gAn1UAdAL+t6ITPJ3HTBik0I9rbuqN
-=fJNa
+iQEcBAEBAgAGBQJP/VzKAAoJEBzRPIrUMBNCuM0H/0sn4PST1utmomF8p5n44gPE
+TKF2zZuRh1/RSFUEMdxcdH4zc6WiJTAxZE1ejqx3/mjApdqtFFAfhNxfcGXearG/
+WfnVyeVF63kfYXIT+1zpmBpg6i6kdVkwepkIDmS7psUdrWiRqQy9E++MB5NEcwHn
+aPwbVvPnnOoIK0xjH3rbp+ocnzxdTvpvSTY2T65sjt8kFsfL56qiN6nGTCRQWfp+
+v4RJGZFw1p7L8bo5GjBYZDacqebUtMdkw3okqpSoeSJMBSpe6uUG4EC9c/OIC6gY
+Rm2iFThUeI9VAa/LT/twkOCLaDNJd3d1T6UjLJYnT8/VDNYZSIaG6lZcnSFbSuk=
+=Dg6X
 -----END PGP SIGNATURE-----
diff --git a/net-dns/maradns/files/maradns-2.0.06-build.patch b/net-dns/maradns/files/maradns-2.0.06-build.patch
new file mode 100644
index 000000000000..4a358b61a5d6
--- /dev/null
+++ b/net-dns/maradns/files/maradns-2.0.06-build.patch
@@ -0,0 +1,54 @@
+Index: maradns-2.0.06/build/Makefile.linux
+===================================================================
+--- maradns-2.0.06.orig/build/Makefile.linux
++++ maradns-2.0.06/build/Makefile.linux
+@@ -10,7 +10,7 @@ POBJECTS=parse/ParseMaraRc.o parse/Parse
+ DOBJECTS=dns/Queries.o dns/Compress.o dns/bobbit.o
+ # Secure random number generator objects
+ ROBJECTS=rng/rng-api-fst.o rng/rng-alg-fst.o
+-OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS)
++OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS) -lrt
+ EXECS=server/maradns
+ 
+ # Uncomment the following three lines to get this to compile on Solaris
+@@ -28,19 +28,21 @@ Q="DEFINES=-DSELECT_PROBLEM"
+ 
+ # Debug
+ 
+-FLAGS = -O2 -Wall -DSELECT_PROBLEM
++FLAGS=$(CFLAGS) $(LDFLAGS) -Wall -DSELECT_PROBLEM
+ M="CC=$(CC) $(FLAGS)"
+ D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+ 
+ all: 
+-	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
+-	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
+-	cd ../qual ; make $(M) ; cd ../server ; \
+-	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
+-	cd ../tools ; make $(M) ; \
+-	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
+-	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++	$(MAKE) -C libs $(M)
++	$(MAKE) -C dns $(M)
++	$(MAKE) -C rng $(M)
++	$(MAKE) -C parse $(M)
++	$(MAKE_ -C qual $(M)
++	$(MAKE) -C server $(M) $(V) COMPILED=\"$(COMPILED)\"
++	$(MAKE) -C tools $(M)
++	$(MAKE) -C deadwood-*/src $(M)
++	$(MAKE) -C tcp $(M) $(V)
+ 
+ debug: 
+ 	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
+Index: maradns-2.0.06/deadwood-3.2.02/src/Makefile.ipv6
+===================================================================
+--- maradns-2.0.06.orig/deadwood-3.2.02/src/Makefile.ipv6
++++ maradns-2.0.06/deadwood-3.2.02/src/Makefile.ipv6
+@@ -86,5 +86,5 @@ Test:		Test.c DwStr.o DwStr.h DwStr_func
+ 	$(CC) $(FLAGS) -Wall -o Test Test.c $(OBJS)
+ 
+ Deadwood:	DwMain.c $(OBJS) DwStr_functions.h version.h
+-	$(CC) $(FLAGS) -DIPV6 -Wall -o Deadwood DwMain.c $(OBJS) 
++	$(CC) $(FLAGS) -DIPV6 -Wall -o Deadwood DwMain.c $(OBJS) -lrt
+ 
diff --git a/net-dns/maradns/maradns-2.0.06.ebuild b/net-dns/maradns/maradns-2.0.06.ebuild
index 40e104ca836b..f9b409a1590f 100644
--- a/net-dns/maradns/maradns-2.0.06.ebuild
+++ b/net-dns/maradns/maradns-2.0.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-2.0.06.ebuild,v 1.2 2012/06/14 02:13:48 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-2.0.06.ebuild,v 1.3 2012/07/11 11:00:14 flameeyes Exp $
 
 EAPI="4"
 inherit eutils toolchain-funcs flag-o-matic user
@@ -26,19 +26,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-askmara-tcp.patch
 	epatch "${FILESDIR}"/${P}-duende-man.patch
 
-	# In order for Deadwood to build correctly, it needs to know where
-	# clock_getttime is at, and on Linux/glibc, this is in librt.
-	# Hopefully, other systems won't have issues.
-	use elibc_glibc && myflags="-lrt"
-
-	# Honor system CFLAGS.
-	# Need to append -lrt to build Deadwood properly.
-	sed -i \
-		-e "s:FLAGS=-O2:\$(M):g" \
-		-e "s:-O2:\$(CFLAGS) \$(LDFLAGS) ${myflags}:" \
-		-e "s:\$(CC):$(tc-getCC):g" \
-		-e "s:make:\$(MAKE):g" \
-		build/Makefile.linux || die
+	# And one from Gentoo
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_configure() {
@@ -47,23 +36,12 @@ src_configure() {
 	# Use duende-ng.c.
 	cp  "${S}/tools/duende-ng.c" "${S}/tools/duende.c"
 
+	tc-export CC
+
 	use ipv6 && myconf="${myconf} --ipv6"
 	./configure ${myconf} || die "Failed to configure ${PN}."
 }
 
-src_compile() {
-	make ${MAKEOPTS} || die "Filed to compile ${PN}."
-
-	# On linux/glibc, we forced -lrt into the build flags to make sure
-	# that clock_getttime() was found in the correct library.  But to
-	# catch this error on other platforms, we'll see if DwSys.o is
-	# present, which indicates a successful build or not.
-	[[ ! -f "${S}/deadwood-${DEADWOOD_VER}/src/DwSys.o" ]]	\
-		&& die "Deadwood failed to build, possibly due to a "	\
-		       "missing reference to clock_gettime.  Please "	\
-		       "report this in a bug!"
-}
-
 src_install() {
 	# Install the MaraDNS binaries.
 	dosbin server/maradns