cleanup old versions

Package-Manager: portage-2.1.11.9/cvs/Linux i686

13 files changed, 17 insertions, 270 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index b9cad69672cd..dd817e7e9bc0 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.28 2012/09/10 19:28:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.29 2012/09/14 20:34:25 darkside Exp $
+
+  14 Sep 2012; Jeremy Olexa <darkside@gentoo.org> -xl2tpd-1.2.4.ebuild,
+  -files/xl2tpd-1.2.4-as-needed.patch, -xl2tpd-1.2.6-r1.ebuild,
+  -files/xl2tpd-1.2.6-as-needed.patch, -files/xl2tpd-1.2.6-qa-fixes.patch,
+  -xl2tpd-1.2.7.ebuild, -files/xl2tpd-1.2.7-as-needed.patch,
+  -files/xl2tpd-1.2.7-qa-fixes.patch, -xl2tpd-1.2.8.ebuild,
+  files/xl2tpd-1.3.0-LDFLAGS.patch, xl2tpd-1.3.1.ebuild:
+  cleanup old versions
 
 *xl2tpd-1.3.1 (10 Sep 2012)
 
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 990e0b116648..39cb17555e0c 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,23 +1,10 @@
-AUX xl2tpd-1.2.4-as-needed.patch 387 SHA256 948ed98a058b9dd34bbd6957a1879a2b763db2f5ff768d7de7113513c9776727 SHA512 dadd7f0a2e9cc7b4f66fc7bcf48d91efba705696e4c57ca057f61a8e11b5a8a01a2f0f8dd7a0db56e15df069c6681139770c2fecb469f9e539e50ed7fe3f37f4 WHIRLPOOL 93c04c320c3d2d00b34009f12f3e509478e2d44fb9e9367ba356c0d582f77b1b60c1118946e0f4eddbe41343f91dd61b199718265e51109e8502f557adf62e1a
-AUX xl2tpd-1.2.6-as-needed.patch 387 SHA256 ef3fdc69e9487e26e03e39cb4733c4d8913237f737808d1a4e76ac10b3dab027 SHA512 61182662c8e688ad14a164939b377bc5ca9355afad697738bb9ccab2489b6a46bb9765cbca2635592dafb956e68cb3c16bc8136710e1d1654ce6d40facb39da1 WHIRLPOOL 1d74e46c766b27bca7ff8c59d6795fbe36ead6c7c491bb9ecf9dd29d6f3b8b06c3d951bb802e3342c1ab011aa2761b343eeb43086dc72a7cf19f4b7ca5d59540
-AUX xl2tpd-1.2.6-qa-fixes.patch 1011 SHA256 83a473792dd0b4f49081b97cb77a5d54ca47ab83dc09898bae76a998bd7e41f2 SHA512 3304d437a294135239ad8b9f46999418e199cf21ea26d099c6d6ba6a0d1e73f995ae289c36168cbb0d1ca0843eb3c2f333b93763d0da21a9ad1292bd0f07742c WHIRLPOOL 375c1bed580dce0c3b6270dd3b4b477a00bbc0f73ad600b01964da865507ea4579577d7b8af121e97d36bb9414c51007e98c9fb5f5841409c3843ac3d8ac6ea2
-AUX xl2tpd-1.2.7-as-needed.patch 387 SHA256 658e0bb47f9a652442ba1c9e438fbafa682ed79e21e18589e0eb2c6b1e9d3c1a SHA512 ebb261e7b7985353662c3f1d131d163580abb6656f5fdb18f43c81f5e90b7484a3c8aa75fb9782274b37e31fa7c4be6fd66dee7eca10164d70f0014a6faa0eff WHIRLPOOL e40b3930fae8c15fdb83dcadfc78efbbf25b12cc1e2d15ff2625410bdf25f3ae0513a398094f068c3c288c22450b46956bb70514f1c6abf12a7bcdca4765dc78
-AUX xl2tpd-1.2.7-qa-fixes.patch 1011 SHA256 499180716da0a35b958293c1c396d9cfba1193b6e4e758c0fc71dc6c596614e0 SHA512 68f0eed13b58107e73ec40b9eedff3c4c62e9705e9b19b2c2e0c3ab443678b11fe8abcb6d384ff86cb55df3cd1506b85a460943fc2a63f56fff1d9358361126a WHIRLPOOL 28cb45d39fb2e2f9e7afa77c1fe449ee7cf9aad00d4c3f1905db5ab2323b7073837d451edbb3f1f98f72ddaa7448ae8a8427a8ac945fd63cefe13a14043c8664
-AUX xl2tpd-1.3.0-LDFLAGS.patch 321 SHA256 bc289758e9880371c2c52f082d7c553f6683922b0b817da87a69dedcce43adff SHA512 1e1f7c4dc1a8d31e4bc0c82d3a727a288ba4db4eaac11d3c6704bdfc3dab4be779e50ee49f443ee2e1a92314595e0ab08730fa3a26dc00a8513a1cd561d90cf8 WHIRLPOOL 6193f2ee667a7d1a5bfac9d6a8d03829407fd430c90fd6c734214916f4942a3b27c0df3ea34129db0b5d947923a8a07ac9afa67877004ae89dc385e698ee1376
+AUX xl2tpd-1.3.0-LDFLAGS.patch 387 SHA256 c240a4e47775f8037c840a8b2ccaefb29ecca610f4c5d65e4effebec9694cd5d SHA512 e388638b623cae4464bd6946b81682ef8a41c50dd3b93d64a9888e94ff34a7e97db1b34b2c950b3e73a783024e5542ce4d18e63c2465787cc25c0a4e8f28f39e WHIRLPOOL 216d7824dac75fc2946ca2ee1c481a33a6932770f54f7adf906fb368c58a5b5289ee6d78bf13ed60d4dfd9b375072edf560cfcaa0269135d891887ee8ac4822c
 AUX xl2tpd-dnsretry.patch 1509 SHA256 ac398be2d5fb67cc7c5e5b7247572d89cde85b2dc988e4e99c470afddfc5860c SHA512 7999c8e990f7bcd620042295e5fc6e12cf4b1e4faf7cd560bdd4ade4103b171e76a06cb11caea0046b8141a4fa9592bd8851f933072c5e7f71d8b1f4b6fb2bbd WHIRLPOOL e584d4b46dc6249d41b8228246f856ca263c9c3b6713bbb953b17d3265653ee4e45a582f1e2c80f3ad33a0369ed59ddfab50e4c1b5bab9e3be22814c3d034880
 AUX xl2tpd-init 727 SHA256 d20d2351ab714843cb5ee10452552e3d5c2eebf6c53b277025d66925fd9904a1 SHA512 c28d919c89fc18b34d5b9018ff8ca7764f78950d66cbac325d7fee4280b929571fea59b3259be247bd9790e967045d699a6e3c72a941ece51a0ed3f250d303f8 WHIRLPOOL 6475677981c6d47641f5010d029fae0aeb95ebf6acd6a6b299d09b8b472bdc43cc4d583215474ef40acb34f1b9bf216492225cb9ad210aa7a65517bd521149d4
 AUX xl2tpd-init-r1 735 SHA256 0a5e734f32b4d646bbe8b1b08eed7652a68ce17187ddc0c05ea333a208588897 SHA512 693336495461bb756c952cbae679bc71b390cca32d99ed64180d85c298f208168b94e7d49e343d365f2fcd319bcabb3aba664e7565cb158df7c60faa72f6b40d WHIRLPOOL b4e6a6a90f7e3967b9f752f3f1eb423405daec6a087b98a90d462feed7d5987b83d80789a022031a97b3261bdb89270325760d34a2d694b25f69a2f37cce363e
-DIST xl2tpd-1.2.4.tar.gz 541039 SHA256 3e6b4314a5100a576dd075684873b1e8b84b58f7f5ceb10731fabd3ebefaa8c4 SHA512 dd9a20cc35e229ac1dc878831c47e18e5a507083a304930e37a07e132938544d4e7dc44fe7cb25cfcccf1113d989db489e00bde98721a0e9e9f25686c4e20696 WHIRLPOOL ac28dfd8db31d69ede709f997d9e5b0dd2f76f43b0be1a2fe4fee48726c42a5fb71b48f9aa9d3af56f6a7934c4d4ddab66b9dd200690de758f12163ba2ce2e7e
-DIST xl2tpd-1.2.6.tar.gz 545153 SHA256 c807c243ee91e344f4f46718fd45565c1242463b4945c1428a4d1c513a418c15
-DIST xl2tpd-1.2.7.tar.gz 545711 SHA256 ed8b86939844f97c6cb9ae8db2ef0eb4432f1726ea50923c4eb2101f925aec6c
-DIST xl2tpd-1.2.8.tar.gz 546214 SHA256 bd0e7ad9e69e9575b0f1a8d017b78f7f61fd4c5372d45b635d6bf2f2d1b5422b
 DIST xl2tpd-1.3.0.tar.gz 550901 SHA256 972b9440d637c7cff3e28ca4cb4131bc33b9394cfcb7d391383202136632c8c0 SHA512 6868060fbce4944919bcc05c603186aaeb04aab52dc9b5276837c1c01dab4739869511c709cb58f6f513e50b7e534cca89edde9ea2ab7d83ee9cc4d4edf30e44 WHIRLPOOL 502317e8433279d24fce4a681b8d0ec7c018c9488950a5a539307d090ad804f3c3a4e1e15eeafbf7d6ba8a82fc6909935438eef099247ce48c11821da4b24836
 DIST xl2tpd-1.3.1.tar.gz 551923 SHA256 147ea96a957628bc31bba6fd5f5ef5522366691f936ce4c0a0988d9876e3ba14 SHA512 2265a19eda1521fd4314ad1b28cc1bb781d2f0edb06ad619afbb364f5896e23db7e444ac10709c1ae9b9ac648e4354aea7af57bb5bc20b706b00e2a131fc29d6 WHIRLPOOL b5465605ae5c3bbf73227f11958a43c66191bb557447ce224de044358e738331cf8e64e783bb5527517683cbcc59d57df9cc17c990f652fe7aed1ab2cfd7f9b2
-EBUILD xl2tpd-1.2.4.ebuild 1078 SHA256 847af2f342f53aada493e98b153b10662c9d81be0736ec8533cab06a6d5eb8ff SHA512 597d7882b02bc5d1b35458b18c9b139f2a58d56b616f2d30ea2b5f3e5b62ea5111984c6a9fbc386d07c93018a0f1c2dd0699d2d120b4bbe4b2be2a8535b969e6 WHIRLPOOL 02731c63aac748298e11307ebe1f362492df46f2268f9159ec1fb624d3ea888e847d25014944024d7cfe8979e767f18ee0bc2389e29547757fd3d012e41907ea
-EBUILD xl2tpd-1.2.6-r1.ebuild 1097 SHA256 b2e8f848ade73384ff6d2bc99443b05a181fb8af45c735bf6bc8befa650eabd8 SHA512 0f0c271274cc56a6b22e910978f7ebfdc10a94cb9860e7b5fc6dbb2e1880a93a4be77da7f36a76e1c62ae73be91084470415bc5fce48a9f392340a549927de78 WHIRLPOOL 15ea25cb3f7c5c8b277d3d0496476fba1cbb4818bb6a4676bc9095053272bc00af3f435a010ac4b3073f1e5a4712524747717f1b94acf678f54923fc3cd95059
-EBUILD xl2tpd-1.2.7.ebuild 1087 SHA256 2b035c4cc26881756742566183a8542f521639467d4fc2f47a982d9ba4d46fc6 SHA512 9ac325d0ce6bb74c43ad492d4580c03d41087c7694bbf9d3de251e2204e64e918df979fc606a043f6e90b3bf950b7ba42a4bc4dc6c641b815b7b7bb3217081a5 WHIRLPOOL c9df64e212b50ba118c6f6993840fc58fd9812234ae5f2a53e0fddbb543b1fb315f36953a98dba6eb42bb883fb9dc8206afd1e34b39ca7dbf81c84da0dfc6aca
-EBUILD xl2tpd-1.2.8.ebuild 1191 SHA256 372eb71967ee805c80e16f606011e429b2c55ef8b55edabc57e1622c9a36c297 SHA512 cd697c099a4c90fec234fbfeb175b836c6fe9109842baf1bb85ffe7e0988ef90ae02b5527f973559f2f128625deafc6360402e2e20f0b2d05ddf59c533de0fd1 WHIRLPOOL e95b8c56088db3ded4116909b374c48c7e7065a2bb14e141d5d48c449c2f39033e8c934a13fe600babdce1b3710abf70df984a057c979ba973b4816600ecd657
 EBUILD xl2tpd-1.3.0.ebuild 1156 SHA256 93e9b36c45f104aa9001d4a14319470dcacb6c3bfb760d095446fdc68bfb6d2e SHA512 7e2202396bae2bc7958f4ecc70538c0967fe155ea3fc0bee55547bab8e68349d2846686204e5cb7154c775148f7a9d9a1912f324803701184af2b87637a56597 WHIRLPOOL 40bf4e24473aab5f0adbf97fd2f5754a4860c1e2f97327df8911269fbf5eee2e12bc293b0af1b50393d80acd704d051230a2b6edbe6a4243d9e4bd603bd4af3e
-EBUILD xl2tpd-1.3.1.ebuild 1254 SHA256 0c60a0021350b5b718604f7a5b301f3d566ad427ec91665306c184692a6be02e SHA512 f628101c5ae37aedb692400a5ddf9eaa00daafb8c16ac3911b592dc6e8b81e0c59550365226fe821821b03c43ca352423b5a1542d385632242911a8a804a1abe WHIRLPOOL 8ed39e9ab970e15c5677efe00a6db978ab24ca7d2f105310e9f64f80aee231878fbdf971a13644a655b3ef5ee0ba4e2699b212ed60b7b563d280e61cfb00e11c
-MISC ChangeLog 4925 SHA256 891261dbe537b31cb7043bdab932b558c87c91b427d5cd4444892b02b2a9208b SHA512 eaece6101ef388ebeac4f6d4034068d0c7e0acd71a11e63d8d0405e2773d8a7adb277761089fb756254c47827b2ba536255901a0926cf00d2b3e9af72015f1c9 WHIRLPOOL b38b43f6fa216e4c440f70e893d1acb5a0599e12d811f571eebf74c0ccf060c27d4a177ae8c6cec15e7b756d2450edaa0f9b8d1fa600bd3c31b0035ef079c8a1
+EBUILD xl2tpd-1.3.1.ebuild 1390 SHA256 4edaac56aa754801050fe0339d0c05f6ffc8fb0564e7956c4bd6e4de7b22e86e SHA512 0ed1024fc60aa62fcbfab2617583f1f969bc9a8a013f9a51b046ed9c7d19f7f8b84170e0370cbf6bdac764c67ed329d3b1b5040d0e79a07dbf1f206eda7f4c1d WHIRLPOOL e57172166fa9d920d297203c7ecfe181c5f26bc9d02e8ad9b236aa094ce41c1e706c3091a578ae6121dc08cbb47695e4f860f40554cecdb422a23193ed3de21b
+MISC ChangeLog 5338 SHA256 df0523a1681108fc7a4c00099ae57880108c8f74862e0a263f7b6dee3f0fa7b5 SHA512 a77dfb6f5755a33ef0d38ba7c414ed76bf341462a4265dee797edd99741c3cba02e7558739839583f2c17cebcf22465a008de7377633d0af5c80dd3f91e639cb WHIRLPOOL dd9402db2401cca3dffab0e0568a161c0c8921528493a68ed06e0ff873bf3c0e09df907d358de1add44ee4d5558e382bea38ab7f1b12eabcd559c838e35f468d
 MISC metadata.xml 386 SHA256 54594868bd121cb99bd6544547e5a86fe62394005354e3af679ba1409a960e7b SHA512 bdadd379b33a7bffd077f2d1353c62d392b5d72249f90f7aaa606640f4ba894dfba7461c7dbec01b7caaebb9a5ae9769d76a5c70a5c4cce2b1db9dad474b4bb6 WHIRLPOOL 855624f39241538b5e4eef19c86d1cdfbd0071ac487f77c20e0b9c696614f3cf193fcc6bce1a0e94f60f8678aa7e93ae499b195f78ea1a0546652a9e0468637a
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.4-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.4-as-needed.patch
deleted file mode 100644
index 737f4480b533..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-1.2.4-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru xl2tpd-1.2.4.orig/Makefile xl2tpd-1.2.4/Makefile
---- xl2tpd-1.2.4.orig/Makefile	2009-03-09 00:25:30.000000000 +0100
-+++ xl2tpd-1.2.4/Makefile	2009-07-16 08:16:28.000000000 +0200
-@@ -113,7 +113,7 @@
- 
- pfc:
- 	$(CC) $(CFLAGS) -c contrib/pfc.c
--	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
-+	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
- 
- romfs:
- 	$(ROMFSINST) /bin/$(EXEC)
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.6-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.6-as-needed.patch
deleted file mode 100644
index 22d8d9beb145..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-1.2.6-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru xl2tpd-1.2.6.orig/Makefile xl2tpd-1.2.6/Makefile
---- xl2tpd-1.2.6.orig/Makefile	2010-05-10 22:35:43.000000000 +0200
-+++ xl2tpd-1.2.6/Makefile	2010-08-15 21:56:20.000000000 +0200
-@@ -113,7 +113,7 @@
- 
- pfc:
- 	$(CC) $(CFLAGS) -c contrib/pfc.c
--	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
-+	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
- 
- romfs:
- 	$(ROMFSINST) /bin/$(EXEC)
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.6-qa-fixes.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.6-qa-fixes.patch
deleted file mode 100644
index fd37c03f6a8c..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-1.2.6-qa-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nru xl2tpd-1.2.6.orig/call.c xl2tpd-1.2.6/call.c
---- xl2tpd-1.2.6.orig/call.c	2010-05-10 22:35:43.000000000 +0200
-+++ xl2tpd-1.2.6/call.c	2010-08-15 22:22:10.000000000 +0200
-@@ -682,15 +682,19 @@
-          */
-         if (gconfig.debug_tunnel)
-         {
-+            struct in_addr inaddr;
-+            inaddr.s_addr = addr;
-             l2tp_log (LOG_DEBUG,
-                  "%s: allocating new tunnel for host %s, port %d.\n",
--                 __FUNCTION__, IPADDY (addr), ntohs (port));
-+                 __FUNCTION__, IPADDY (inaddr), ntohs (port));
-         }
-         if (!(st = new_tunnel ()))
-         {
-+            struct in_addr inaddr;
-+            inaddr.s_addr = addr;
-             l2tp_log (LOG_WARNING,
-                  "%s: unable to allocate new tunnel for host %s, port %d.\n",
--                 __FUNCTION__, IPADDY (addr), ntohs (port));
-+                 __FUNCTION__, IPADDY (inaddr), ntohs (port));
-             return NULL;
-         };
-         st->peer.sin_family = AF_INET;
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.7-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.7-as-needed.patch
deleted file mode 100644
index d92c7e653f11..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-1.2.7-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru xl2tpd-1.2.7.orig/Makefile xl2tpd-1.2.7/Makefile
---- xl2tpd-1.2.7.orig/Makefile	2010-08-06 00:33:46.000000000 +0200
-+++ xl2tpd-1.2.7/Makefile	2010-11-27 11:57:10.000000000 +0100
-@@ -113,7 +113,7 @@
- 
- pfc:
- 	$(CC) $(CFLAGS) -c contrib/pfc.c
--	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
-+	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
- 
- romfs:
- 	$(ROMFSINST) /bin/$(EXEC)
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.7-qa-fixes.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.7-qa-fixes.patch
deleted file mode 100644
index 10c5e6dde53d..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-1.2.7-qa-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nru xl2tpd-1.2.7.orig/call.c xl2tpd-1.2.7/call.c
---- xl2tpd-1.2.7.orig/call.c	2010-08-06 00:33:46.000000000 +0200
-+++ xl2tpd-1.2.7/call.c	2010-11-27 11:58:13.000000000 +0100
-@@ -665,15 +665,19 @@
-          */
-         if (gconfig.debug_tunnel)
-         {
-+            struct in_addr inaddr;
-+            inaddr.s_addr = addr;
-             l2tp_log (LOG_DEBUG,
-                  "%s: allocating new tunnel for host %s, port %d.\n",
--                 __FUNCTION__, IPADDY (addr), ntohs (port));
-+                 __FUNCTION__, IPADDY (inaddr), ntohs (port));
-         }
-         if (!(st = new_tunnel ()))
-         {
-+            struct in_addr inaddr;
-+            inaddr.s_addr = addr;
-             l2tp_log (LOG_WARNING,
-                  "%s: unable to allocate new tunnel for host %s, port %d.\n",
--                 __FUNCTION__, IPADDY (addr), ntohs (port));
-+                 __FUNCTION__, IPADDY (inaddr), ntohs (port));
-             return NULL;
-         };
-         st->peer.sin_family = AF_INET;
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch b/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch
index a87ab3fff8b9..8203e51ebc1f 100644
--- a/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch
@@ -1,3 +1,5 @@
+"Submitted" upstream: https://github.com/xelerance/xl2tpd/pull/4
+
 === modified file 'Makefile'
 --- Makefile	2011-09-20 04:44:23 +0000
 +++ Makefile	2011-09-20 04:44:35 +0000
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
deleted file mode 100644
index 504b945108b8..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild,v 1.2 2010/08/15 20:33:23 mrness Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
-SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	net-dialup/ppp"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_compile() {
-	append-flags -DTRUST_PPPD_TO_DIE
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CREDITS README.xl2tpd \
-		doc/README.patents doc/rfc2661.txt doc/*.sample
-
-	dodir /etc/xl2tpd
-	head -n 2 doc/l2tp-secrets.sample > "${D}/etc/xl2tpd/l2tp-secrets"
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
-
-	keepdir /var/run/xl2tpd
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild
deleted file mode 100644
index 7273d731bc98..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.6-r1.ebuild,v 1.1 2010/09/19 11:31:22 mrness Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
-SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dnsretry"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	net-dialup/ppp"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-qa-fixes.patch
-	use dnsretry && epatch "${FILESDIR}"/${PN}-dnsretry.patch
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CREDITS README.xl2tpd \
-		doc/README.patents doc/rfc2661.txt doc/*.sample
-
-	dodir /etc/xl2tpd
-	head -n 2 doc/l2tp-secrets.sample > "${D}/etc/xl2tpd/l2tp-secrets"
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
-
-	keepdir /var/run/xl2tpd
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.7.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.7.ebuild
deleted file mode 100644
index ecd45ab30466..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.2.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.7.ebuild,v 1.1 2010/11/27 11:01:36 mrness Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/software/"
-SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dnsretry"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	net-dialup/ppp"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-qa-fixes.patch
-	use dnsretry && epatch "${FILESDIR}"/${PN}-dnsretry.patch
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CREDITS README.xl2tpd \
-		doc/README.patents doc/rfc2661.txt doc/*.sample
-
-	dodir /etc/xl2tpd
-	head -n 2 doc/l2tp-secrets.sample > "${D}/etc/xl2tpd/l2tp-secrets"
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
-
-	keepdir /var/run/xl2tpd
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.8.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.8.ebuild
deleted file mode 100644
index 01ba987dd0a8..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.8.ebuild,v 1.1 2011/07/18 07:33:10 pva Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dnsretry"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	net-dialup/ppp"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.7-qa-fixes.patch"
-	sed -i Makefile -e 's| -O2 | $(USERCFLAGS) |g' || die "sed Makefile"
-	use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) USERCFLAGS="${CFLAGS}"
-}
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	dodoc CREDITS README.xl2tpd \
-		doc/README.patents doc/rfc2661.txt doc/*.sample
-
-	dodir /etc/xl2tpd
-	head -n 2 doc/l2tp-secrets.sample > "${ED}/etc/xl2tpd/l2tp-secrets" || die
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
-
-	keepdir /var/run/xl2tpd
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild
index 28ddb632d5da..d3405dc5a675 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1.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-dialup/xl2tpd/xl2tpd-1.3.1.ebuild,v 1.1 2012/09/10 19:28:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild,v 1.2 2012/09/14 20:34:25 darkside Exp $
 
 EAPI="4"
 
@@ -24,6 +24,8 @@ S="${WORKDIR}/xelerance-${PN}-95445fc"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch"
 	sed -i Makefile -e 's| -O2 ||g' || die "sed Makefile"
+	# The below patch is questionable. Why wasn't it submitted upstream? If it
+	# ever breaks, it will just be removed. -darkside 20120914
 	use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
 }