summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/vde/ChangeLog11
-rw-r--r--net-misc/vde/Manifest35
-rw-r--r--net-misc/vde/files/Unixterm_20070403.patch208
-rw-r--r--net-misc/vde/files/vde-2.1.6-gcc43.patch35
-rw-r--r--net-misc/vde/vde-1.5.7.ebuild35
-rw-r--r--net-misc/vde/vde-2.0.2.ebuild32
-rw-r--r--net-misc/vde/vde-2.1.6-r1.ebuild42
-rw-r--r--net-misc/vde/vde-2.1.6.ebuild35
-rw-r--r--net-misc/vde/vde-2.2.3.ebuild47
-rw-r--r--net-misc/vde/vde-2.3.1.ebuild19
10 files changed, 35 insertions, 464 deletions
diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog
index 264d3abe749d..ded146334d2e 100644
--- a/net-misc/vde/ChangeLog
+++ b/net-misc/vde/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-misc/vde
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.23 2010/08/26 01:28:02 dang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.24 2011/10/23 12:18:42 scarabeus Exp $
+
+ 23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/Unixterm_20070403.patch, -vde-1.5.7.ebuild, -vde-2.0.2.ebuild,
+ -vde-2.1.6.ebuild, -vde-2.1.6-r1.ebuild, -files/vde-2.1.6-gcc43.patch,
+ -vde-2.2.3.ebuild, vde-2.3.1.ebuild:
+ Bump to eapi4 and make static libs optional, punt overshadowed as only
+ consumer does not care about version.
*vde-2.3.1 (26 Aug 2010)
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 34e092ed82cd..c16e12b033b2 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,33 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
-AUX Unixterm_20070403.patch 5054 RMD160 76a8200d0975aa172f39a6937799a5ef2b9bbd40 SHA1 05d891782ea64a639e4c68ade3533a34695d392f SHA256 a17223c1b93c74e9e97636f47da3dd194f499f3b216cf17c50f1f37913b3533a
-AUX vde-2.1.6-gcc43.patch 1010 RMD160 0b3d0872a6ed18fe5bc5e9cebb586194c461b206 SHA1 2983befee2e55ef596c1666ceef3c72290eb672c SHA256 00b6d858a0a5e196555ce5574b9e98ea27b34e737ab1afdfc691b600770465ab
AUX vde-2.2.2-gcc43.patch 1867 RMD160 e5587fa07b9c8e8caa3f2f03b2dca7f2858478a2 SHA1 cc22e018d5347cae34f430e2f6075b56c0c797d5 SHA256 313a1c3477241adfaf0547577457de669b369a1e83876e1c494d64e0524a4463
AUX vde-2.2.2-slirpvde-buffer-overflow.patch 1427 RMD160 3baca367b80d0b80f87135f4527915a1951a6162 SHA1 bcc6000255658e89f209222f56d53731f9d58866 SHA256 4e21492c1ca73bba9adcd1e17f6b51b15912631ce18042bf9d2a0b618c0056d0
AUX vde.conf 305 RMD160 844283848ec1a05cd471a5dae9ffcd7b6c3d1297 SHA1 60f6a47b947160d7fb0e40299ca7d85f800a6778 SHA256 821da54d238d80324677df7d6647a2224984bf80d292b20655cf374c16e44424
AUX vde.init 733 RMD160 2e197f79b8a93e2bcf2fcc69f6eb2ee229c148ae SHA1 a11051d77fda5ac98c5502936c9d593890fd260f SHA256 e8dfaab2d00625ffe72e62df60309ab238fd51f6cd0e7516814f5dc3126e657b
-DIST vde-1.5.7.tgz 139314 RMD160 213f87ea465b76c276b660f0b0733820273f5ca7 SHA1 81fc285e56b431a13220e8c8df80b492482b5158 SHA256 a80d907c1705e9b4f5eb62593753f5120e8e71066395fa3241eb425825ccf82b
-DIST vde-2.0.2.tar.bz2 382162 RMD160 c15ef9f3743538c2dd1bd0ba99c8078741302100 SHA1 8cdbd63e3214dd24f0fe987c0d9ccde57ae9db6a SHA256 05b473815f9706387a3c5eaeb4da2e492f624e0b7783432179454f9d69bb973c
-DIST vde2-2.1.6.tar.bz2 390222 RMD160 083be75c89c5915ce7fa8a2b300a09af49e793cd SHA1 4eb7966e03490b5f9367e7fb08fbfbd7ada98e6e SHA256 4a4664346e357e95f3113af6d72878d57e0ef5d493d476ec49870376a2ee00e7
DIST vde2-2.2.2.tar.bz2 472059 RMD160 a7b993cc89c824f177790166daa3a7630415b429 SHA1 aca69699cb5f7cd5dec71daaf5d4bc9f05450315 SHA256 7d4b68c1ba1b661db05ff3674abff4d2ad5da31bb3471699bbec3f2f360b483a
-DIST vde2-2.2.3.tar.bz2 523988 RMD160 8fcbf2552d1e90413c778deac721b5d0172ce96f SHA1 de5b1009e1740f68c3feae6c059855affc28cac5 SHA256 1a0f612a7c5a176a138cac44e83deefa4f7156e303fe482718c6fdc98a691883
DIST vde2-2.3.1.tar.bz2 510947 RMD160 a1d0055422f34871ad3762b6093b1d39d9657184 SHA1 10e199a2dbc3d207ee29269e34f05cc5140878d9 SHA256 0baa6d429e022eb4069252c0f58636c4b5e0dd2e3a495bdb14b32ecc363d147f
-EBUILD vde-1.5.7.ebuild 1064 RMD160 85d839d3de8da6d175f97ab27f5d1ebabb9e37e7 SHA1 789739af38b4ce552045ec906657f38beefdc589 SHA256 511e553edd0e59120518e23c7f7a0f3ac0d060e64a6a3fbdb4ef25fba03bd0f5
-EBUILD vde-2.0.2.ebuild 1051 RMD160 2a4c834459c06f1bd5c6722334bfb4a270a3b867 SHA1 027c3559baac6d1dc865375588934b9fd6aec330 SHA256 e74e99838101022ea30072604ea35ea357118ab2d543bcf41ec4781341fdb248
-EBUILD vde-2.1.6-r1.ebuild 1232 RMD160 aa471f5cbd545b784acfe95e0d9a20e5c02c74ff SHA1 53addcc646619dea1fd878a45ae241f1f7fc0e5c SHA256 ee4396977c6f052e4b3770a3b48f3898b39652d7d1ad20c919c908cca82501ff
-EBUILD vde-2.1.6.ebuild 1099 RMD160 07755732ad3c5cd8c2494d335f20bbef31452419 SHA1 ed9ac22b2e39dbbbf1e91bab245b583ddb46f719 SHA256 dc83def2128b6ae678997429774e7023e4d36e0b078d979f0f56ef2c8cf10e09
EBUILD vde-2.2.2.ebuild 1399 RMD160 6fba9ef937f1f6199cee570810fba0ef4d5edf58 SHA1 0c2b8d69d242ee75b9bf04160938ac3c6a2a47c1 SHA256 59f6e1222b4207180b1056cc9ab18ec5f61634b7fd80233f04f4920c592f5090
-EBUILD vde-2.2.3.ebuild 1312 RMD160 c6927d86a0550e6ebfa360df5175c754f50146c5 SHA1 2075b4d5f5cd8489e139d21d38c3a33fb0aaf366 SHA256 f6cd422209c768660bf4c0045d52338379041f246322c6a9270330f5d93e6a9a
-EBUILD vde-2.3.1.ebuild 1307 RMD160 104d30c4e410760070d09ca5bec85edb0d1f776c SHA1 717a2c6e64b2cf1dce1fdd97f07a545a71aec2bc SHA256 4c9972f9cb6cd6c4792d3a4953db7d6d21fdd36b3f9aefd05349092815ad2079
-MISC ChangeLog 4162 RMD160 0ad2972af736c5670146fd3cace10cd7aa44561a SHA1 944ac23b07012c756e2b3120b3662304704faaa3 SHA256 52aa31a7a7841930d3669a61d541093bb874fdf18774495a8bf1bc267cc9bf36
+EBUILD vde-2.3.1.ebuild 1328 RMD160 63edc091385d6611def45a8672699344e65e094b SHA1 afc44147cce41d41279de2ee34a38eeef53f37b4 SHA256 5add88796295b3b4779937b442d097ee3f8df39dc1e7b3ae7ceee0baf8c152da
+MISC ChangeLog 4520 RMD160 d755aad32882bf2937f8cd327c06bb4252b1ec67 SHA1 bd2bba405218a6625657a720b12bad8a623442f0 SHA256 4bebad30f6408e19a8b6a2d4c8aa15973fa50204363030c54e15a026c1819ec7
MISC metadata.xml 627 RMD160 a98aa6d1f095b0b8cafd07dee0ebf5934a5c15d7 SHA1 4e9386f3c839c902553469719032cac3f6226b70 SHA256 73eb3d200695f78fb94944b6db9bf67a108ae8f48a5fa06ea535e62d4a53253c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iJwEAQEIAAYFAk59rRYACgkQfXuS5UK5QB1sgwP8Cz6AJDz+7qoafbedAEIFabRb
-lUmNI8RAWgmGc+lZ4+5NisFgrp5mR3JluZtfwYBT2w+DQGzHTgjgVWqje4wM2t2v
-pb7eRy9RDcNVxSbD6DkzjRLAiltWOJC435HIspPLqyq1UCK4OCz15sQR3l3rWAoc
-izr53U4+JAq6ZpaM2Bo=
-=uj9M
+iQIcBAEBAgAGBQJOpAXTAAoJEOSiRoyO7jvoAVsP/Rix0lSFSkfW6MLrTkGCF8P0
+1c1l3T8LPo18qVpQNU/HHPktsz1qgz5JEGLh5U1Y3Q44mKXhWiOtUpdbKbSQW5bT
+l6VlTQo0HLS93jkG1AJql3y733XCLF/i6xH7SEjl+HkjkbSaMzWOAO2Ry0/sDWl5
+VIO8PSt0eAkwUyJrPMpoymWcyFrPOPNDlrtSdy3/oX0AKeTmpAPOwLFvwIoaFynW
+4jUw2P0BvUAftP6ao73b5untlzDZ3lu0kIXjZnbkDmenWmewEakiLuVukGgf7Ts4
+LnpMlh0RKCuh8RZ9/Y1ypnm/qEuFfpJz0L34eG+WDSlpvPK5g4ooc8UVAhQuH4/k
+jGAbjg2OvG9znuMT3LEsnYrDMrmE7xU9jS6MX6sk8LbPXn0lD7REG/UNG9mzGzkx
+ZnMDEmqm1QPHXJk6fJogPbuneQwJXk91Kmr04tkYbiQ9IX/KkdKZ9Oj4e6Gs3oIf
+EwAlAy1CGUYQhEhRYGAnobfs5MJ2nrpJtWf1sVORQEUeS53KZH6tmFVetZ4UUKGI
+EGgGecTz6UfO2sTN6tvkPt1f7AavRmUwZwVyTKsxTu0FsuW5kkDDL8BYqiarDoep
+KB9JMOBqtHvOVX+tMLofPbFnHG6Ju8zzn160RMEYsRdREktfME5PsM7CY32vlYZO
+Dy/kr/SoeZ6Er579akST
+=j8DI
-----END PGP SIGNATURE-----
diff --git a/net-misc/vde/files/Unixterm_20070403.patch b/net-misc/vde/files/Unixterm_20070403.patch
deleted file mode 100644
index 0d5a2a6cb8ee..000000000000
--- a/net-misc/vde/files/Unixterm_20070403.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -Naur vde2-2.1.6/unixterm/unixterm.c vde2-2.1.6-unixterm/unixterm/unixterm.c
---- vde2-2.1.6/unixterm/unixterm.c 2006-07-07 16:54:39.000000000 +0200
-+++ vde2-2.1.6/unixterm/unixterm.c 2007-04-03 12:49:14.000000000 +0200
-@@ -4,6 +4,8 @@
- * Minimal terminal emulator on a UNIX stream socket
- */
-
-+/* render: addedd support for stdin commands */
-+
- #include <stdio.h>
- #include <fcntl.h>
- #include <stdlib.h>
-@@ -11,10 +13,12 @@
- #include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--
-+#include <getopt.h>
- #include <vde.h>
-
- #define BUFSIZE 1024
-+#define LINESIZE 1025
-+#define THRESHOLD 4
- char buf[BUFSIZE];
-
- int main(int argc,char *argv[])
-@@ -23,25 +27,168 @@
- int fd;
- int rv;
- static struct pollfd pfd[]={
-- {STDIN_FILENO,POLLIN | POLLHUP,0},
-- {STDIN_FILENO,POLLIN | POLLHUP,0}};
-+ {STDIN_FILENO,POLLIN | POLLHUP, 0},
-+ {STDIN_FILENO,POLLIN | POLLHUP, 0}};
- static int fileout[]={STDOUT_FILENO,STDOUT_FILENO};
-+ int optret;
-+ char *sockpath, *sockname;
-+ char sentinel = 0;
-+ unsigned char injecting = 0;
-+ unsigned char optcount = 0;
-+ unsigned char failures = 0;
-+ unsigned char loggedout = 0;
-+ unsigned char ok_to_write = 0;
-+
-+ /* options management loop */
-+ while (1) {
-+ static struct option options[] = {
-+ {"inject", 0, 0, 0}, /* get command list from stdin */
-+ {"socket", 1, 0, 0}, /* management socket */
-+ {0, 0, 0, 0} /* default case */
-+ };
-+ int option_index = 0;
-+
-+ if ((optret = getopt_long (argc, argv, "is:", options, &option_index)) == -1)
-+ break;
-+
-+ optcount++;
-+
-+ switch (optret) {
-+ case 0:
-+ switch (option_index) {
-+ case 0:
-+ injecting = 1;
-+ break;
-+ case 1:
-+ if ((sockpath = strdup(optarg)) == NULL)
-+ fprintf(stderr, "strdup error\n");
-+ sockname = (char *)basename(sockpath);
-+ break;
-+ default:
-+ fprintf(stderr, "unknown long option\n");
-+ break;
-+ }
-+
-+ break;
-+
-+ case 'i':
-+ injecting = 1;
-+ break;
-+
-+ case 's':
-+ if ((sockpath = strdup(optarg)) == NULL)
-+ fprintf(stderr, "strdup error\n");
-+ sockname = (char *)basename(sockpath);
-+ break;
-+
-+ case '?':
-+ fprintf(stderr, "unknown short option\n");
-+ break;
-+
-+ default:
-+ fprintf(stderr, "default case!\n");
-+ break;
-+ }
-+ }
-+
- sun.sun_family=PF_UNIX;
-- snprintf(sun.sun_path,sizeof(sun.sun_path),"%s",argv[1]);
-+ snprintf(sun.sun_path,sizeof(sun.sun_path),"%s", optcount ? sockpath : argv[1]);
-+
- fd=socket(PF_UNIX,SOCK_STREAM,0);
-- rv=connect(fd,(struct sockaddr *)(&sun),sizeof(sun));
-+
-+ if (connect(fd, (struct sockaddr *)(&sun), sizeof(sun)) < 0) {
-+ perror("connect");
-+ exit(-1);
-+ }
-+
- pfd[1].fd=fileout[0]=fd;
-+
- while(1) {
-- int m,i,n=poll(pfd,2,-1);
-- for(i=0;n>0;i++) {
-- if(pfd[i].revents & POLLHUP)
-- exit(0);
-+ int ccount,m,i,n = poll(pfd,2,-1);
-+ for(i = 0; n > 0; i++) {
- if(pfd[i].revents & POLLIN) {
-- n--;
-- if((m=read(pfd[i].fd,buf,BUFSIZE)) == 0)
-+ --n;
-+ if (injecting) {
-+ switch (i) {
-+ case 0:
-+ if (!feof(stdin)) {
-+ ccount = 0;
-+
-+ if (sentinel > 0) {
-+ buf[ccount] = sentinel;
-+ ccount++;
-+ }
-+
-+ while ((buf[ccount] = fgetc(stdin)) != '\n' && !feof(stdin))
-+ ccount++;
-+ /* avoid write of empty lines */
-+ if ((ccount > 0) && (buf[0] != '\n')) {
-+ write(fileout[i],buf,ccount);
-+ }
-+ sentinel = fgetc(stdin);
-+ }
-+ /* end of stdin: logout from management console */
-+ if (feof(stdin) && !loggedout) {
-+ write(fileout[i],"logout\n",strlen("logout\n"));
-+ loggedout = 1;
-+ }
-+
-+ break;
-+ case 1: {
-+ int cursor = 0;
-+ int base = 0;
-+ char line[LINESIZE];
-+ unsigned char start = 1;
-+
-+ if ((m = read(pfd[i].fd,buf,BUFSIZE)) == 0)
-+ exit(0);
-+
-+ while (cursor < m) {
-+ while ((buf[cursor] != '\n') && (cursor <= m))
-+ cursor++;
-+
-+ memcpy(line, &buf[base], cursor - base + 1);
-+
-+ if (!ok_to_write && (start = (strstr(line, "0000 DATA") == NULL))) {
-+ base += (cursor - base) + 1;
-+ cursor += 1;
-+ } else {
-+ if (ok_to_write && (strstr(line, ".\n") != NULL)) {
-+ ok_to_write = 0;
-+ }
-+
-+ if (ok_to_write) {
-+ write(fileout[i],sockname, strlen(sockname));
-+ write(fileout[i],": ", 2);
-+ write(fileout[i],line,cursor - base + 1);
-+ }
-+ else {
-+ if (!start) {
-+ ok_to_write = 1;
-+ start = 1;
-+ }
-+ }
-+ base += (cursor - base) + 1;
-+ cursor += 1;
-+ }
-+ }
-+
-+ break;
-+ }
-+ }
-+ } else {
-+ if((m=read(pfd[i].fd,buf,BUFSIZE)) == 0)
-+ exit(0);
-+
-+ write(fileout[i],buf,m);
-+ }
-+ }
-+
-+ if(pfd[i].revents & POLLHUP) {
-+ --n;
-+ if (sentinel > 0)
- exit(0);
-- write(fileout[i],buf,m);
- }
-- }
-- }
-+ } /* for */
-+ } /* infinite while */
- }
diff --git a/net-misc/vde/files/vde-2.1.6-gcc43.patch b/net-misc/vde/files/vde-2.1.6-gcc43.patch
deleted file mode 100644
index 80122b26c75d..000000000000
--- a/net-misc/vde/files/vde-2.1.6-gcc43.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- slirpvde/slirpvde.c 2006-12-18 16:24:27.000000000 +0100
-+++ slirpvde/slirpvde.c 2008-07-10 15:44:39.000000000 +0200
-@@ -32,8 +32,8 @@
-
- #include "misc.h"
-
-+#include <limits.h>
- #ifdef VDE_DARWIN
--# include <limits.h>
- # if defined HAVE_SYSLIMITS_H
- # include <syslimits.h>
- # elif defined HAVE_SYS_SYSLIMITS_H
---- vde_plug2tap/vde_plug2tap.c 2006-12-18 14:49:57.000000000 +0100
-+++ vde_plug2tap/vde_plug2tap.c 2008-07-10 15:45:12.000000000 +0200
-@@ -30,9 +30,9 @@
- #include <linux/if_tun.h>
- #endif
-
-+#include <limits.h>
- #ifdef VDE_DARWIN
- # define TAP_PREFIX "/dev/"
--# include <limits.h>
- # if defined HAVE_SYSLIMITS_H
- # include <syslimits.h>
- # elif defined HAVE_SYS_SYSLIMITS_H
---- vdetaplib/libvdetap.c 2006-12-18 14:36:05.000000000 +0100
-+++ vdetaplib/libvdetap.c 2008-07-10 15:47:24.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/ioctl.h>
- #include <linux/if.h>
- #include <linux/if_tun.h>
-+#include <limits.h>
-
- #define TUNTAPPATH "/dev/net/tun"
- #define VDETAPEXEC LIBEXECDIR "/vdetap"
diff --git a/net-misc/vde/vde-1.5.7.ebuild b/net-misc/vde/vde-1.5.7.ebuild
deleted file mode 100644
index a28bfb98497c..000000000000
--- a/net-misc/vde/vde-1.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-1.5.7.ebuild,v 1.3 2010/10/28 09:39:29 ssuominen Exp $
-
-DESCRIPTION="vde is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${P}.tgz"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
- mv Makefile Makefile.1
- sed -e 's/ $(BIN_DIR)/ $(DESTDIR)$(BIN_DIR)/' <Makefile.1 >Makefile
- cat Makefile
- cd vdetaplib
- mv Makefile Makefile.1
- sed -e 's/ $(BIN_DIR)/ $(DESTDIR)$(BIN_DIR)/' -e 's/ $(LIB_DIR)/ $(DESTDIR)$(LIB_DIR)/' <Makefile.1 >Makefile
- cd ..
- cd doc
- mv Makefile Makefile.1
- sed -e 's/ $(MAN_DIR)/ $(DESTDIR)$(MAN_DIR)/' <Makefile.1 >Makefile
- cd ..
- BIN_DIR=/usr/bin LIB_DIR=/usr/lib MAN_DIR=/usr/man emake || die
-}
-
-src_install() {
-
- BIN_DIR=/usr/bin LIB_DIR=/usr/lib MAN_DIR=/usr/man make DESTDIR=${D} install || die
-
- dodoc INSTALL PORTS README
-}
diff --git a/net-misc/vde/vde-2.0.2.ebuild b/net-misc/vde/vde-2.0.2.ebuild
deleted file mode 100644
index cede808365ea..000000000000
--- a/net-misc/vde/vde-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.0.2.ebuild,v 1.3 2006/10/24 03:31:57 dang Exp $
-
-inherit eutils
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/vde.init vde
- newconfd "${FILESDIR}"/vde.conf vde
-
- dodoc INSTALL README
-}
-
-pkg_postinst() {
- # default group already used in kqemu
- enewgroup qemu
- einfo "To start vde automatically add it to the default runlevel:"
- einfo "# rc-update add vde default"
- einfo "You need to setup tap0 in /etc/conf.d/net"
- einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
- einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.1.6-r1.ebuild b/net-misc/vde/vde-2.1.6-r1.ebuild
deleted file mode 100644
index 8f397511eefe..000000000000
--- a/net-misc/vde/vde-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6-r1.ebuild,v 1.3 2008/07/20 14:38:55 loki_val Exp $
-
-inherit eutils
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/Unixterm_20070403.patch"
- epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/vde.init vde
- newconfd "${FILESDIR}"/vde.conf vde
-
- dodoc INSTALL README
-}
-
-pkg_postinst() {
- # default group already used in kqemu
- enewgroup qemu
- einfo "To start vde automatically add it to the default runlevel:"
- einfo "# rc-update add vde default"
- einfo "You need to setup tap0 in /etc/conf.d/net"
- einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
- einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.1.6.ebuild b/net-misc/vde/vde-2.1.6.ebuild
deleted file mode 100644
index e3c97287131c..000000000000
--- a/net-misc/vde/vde-2.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.1.6.ebuild,v 1.2 2007/02/12 22:58:21 peper Exp $
-
-inherit eutils
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/vde.init vde
- newconfd "${FILESDIR}"/vde.conf vde
-
- dodoc INSTALL README
-}
-
-pkg_postinst() {
- # default group already used in kqemu
- enewgroup qemu
- einfo "To start vde automatically add it to the default runlevel:"
- einfo "# rc-update add vde default"
- einfo "You need to setup tap0 in /etc/conf.d/net"
- einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
- einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.2.3.ebuild b/net-misc/vde/vde-2.2.3.ebuild
deleted file mode 100644
index 4c89c31504e8..000000000000
--- a/net-misc/vde/vde-2.2.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.2.3.ebuild,v 1.1 2009/10/21 09:43:46 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="pcap ssl"
-
-RDEPEND="pcap? ( net-libs/libpcap )
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- $(use_enable pcap) \
- $(use_enable ssl cryptcab)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/vde.init vde || die
- newconfd "${FILESDIR}"/vde.conf vde || die
-
- dodoc README Changelog || die
-}
-
-pkg_postinst() {
- # default group already used in kqemu
- enewgroup qemu
- einfo "To start vde automatically add it to the default runlevel:"
- einfo "# rc-update add vde default"
- einfo "You need to setup tap0 in /etc/conf.d/net"
- einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
- einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.3.1.ebuild b/net-misc/vde/vde-2.3.1.ebuild
index 07f1e956955d..9131c38aa75e 100644
--- a/net-misc/vde/vde-2.3.1.ebuild
+++ b/net-misc/vde/vde-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.3.1.ebuild,v 1.1 2010/08/26 01:28:02 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.3.1.ebuild,v 1.2 2011/10/23 12:18:42 scarabeus Exp $
-EAPI=2
+EAPI=4
inherit eutils
@@ -16,7 +16,7 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="pcap ssl"
+IUSE="pcap ssl static-libs"
RDEPEND="pcap? ( net-libs/libpcap )
ssl? ( dev-libs/openssl )"
@@ -25,15 +25,16 @@ DEPEND="${RDEPEND}"
src_configure() {
econf \
$(use_enable pcap) \
- $(use_enable ssl cryptcab)
+ $(use_enable ssl cryptcab) \
+ $(use_enable static-libs static)
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/vde.init vde || die
- newconfd "${FILESDIR}"/vde.conf vde || die
+ default
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
- dodoc README Changelog || die
+ newinitd "${FILESDIR}"/vde.init vde
+ newconfd "${FILESDIR}"/vde.conf vde
}
pkg_postinst() {