Drop obsolete patches

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

3 files changed, 5 insertions, 126 deletions

diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index 3a25b7663687..b8690df16227 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vtun
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.50 2012/08/30 18:44:35 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.51 2012/09/16 12:12:02 pinkbyte Exp $
+
+  16 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -files/vtun-2.6-lzo2.patch,
+  -files/vtun-2.6-makefile.patch:
+  Drop obsolete patches
 
   30 Aug 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Set correct email address, drop proxy maintainer
diff --git a/net-misc/vtun/files/vtun-2.6-lzo2.patch b/net-misc/vtun/files/vtun-2.6-lzo2.patch
deleted file mode 100644
index 7cc82cf65ba1..000000000000
--- a/net-misc/vtun/files/vtun-2.6-lzo2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ru vtun.orig/configure vtun/configure
---- vtun.orig/configure	2002-12-21 04:22:15.000000000 +1100
-+++ vtun/configure	2005-11-13 16:57:22.000000000 +1100
-@@ -2001,14 +2001,14 @@
- 	  CPPFLAGS="$CPPFLAGS -I$p"
- 	fi
-         echo "$ac_t""($dir) yes " 1>&6 
--	echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6
--echo "configure:2006: checking for lzo1x_decompress in -llzo" >&5
--ac_lib_var=`echo lzo'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
-+	echo $ac_n "checking for lzo1x_decompress in -llzo2""... $ac_c" 1>&6
-+echo "configure:2006: checking for lzo1x_decompress in -llzo2" >&5
-+ac_lib_var=`echo lzo2'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-llzo  $LIBS"
-+LIBS="-llzo2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2014 "configure"
- #include "confdefs.h"
-@@ -2037,7 +2037,7 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--	       LIBS="$LIBS -llzo"
-+	       LIBS="$LIBS -llzo2"
- 	       cat >> confdefs.h <<\EOF
- #define HAVE_LZO 1
- EOF
-@@ -2437,7 +2437,7 @@
- echo "$ac_t""" 1>&6
- 
- 
--REL=`echo 'REL-2_6' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
-+REL=`echo '$Name:  $' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
- 
- 
- cat >> confdefs.h <<EOF
-diff -ru vtun.orig/configure.in vtun/configure.in
---- vtun.orig/configure.in	2002-12-21 04:13:03.000000000 +1100
-+++ vtun/configure.in	2005-11-13 16:56:59.000000000 +1100
-@@ -119,9 +119,9 @@
-    AC_CHECKING( for LZO Library and Header files ... )
-    AC_SEARCH_HEADERS(lzo1x.h, 
- 	$LZO_HDR_DIR /usr/include/lzo "" /usr/local/include,
--        AC_CHECK_LIB(lzo, lzo1x_decompress,
-+        AC_CHECK_LIB(lzo2, lzo1x_decompress,
- 	    [
--	       LIBS="$LIBS -llzo"
-+	       LIBS="$LIBS -llzo2"
- 	       AC_DEFINE(HAVE_LZO)
- 	    ],
- 	    AC_MSG_ERROR( LZO library not found. )
-diff -ru vtun.orig/lfd_lzo.c vtun/lfd_lzo.c
---- vtun.orig/lfd_lzo.c	2002-04-25 19:19:50.000000000 +1000
-+++ vtun/lfd_lzo.c	2005-11-13 17:01:46.000000000 +1100
-@@ -74,7 +74,7 @@
- 	vtun_syslog(LOG_ERR,"Can't allocate buffer for the compressor");
- 	return 1;
-      }	
--     if( !(wmem = lzo_malloc(mem)) ){
-+     if( !(wmem = malloc(mem)) ){
- 	vtun_syslog(LOG_ERR,"Can't allocate buffer for the compressor");
- 	return 1;
-      }	
-@@ -92,7 +92,7 @@
- int free_lzo()
- {
-      lfd_free(zbuf); zbuf = NULL;
--     lzo_free(wmem); wmem = NULL;
-+     free(wmem); wmem = NULL;
-      return 0;
- }
- 
diff --git a/net-misc/vtun/files/vtun-2.6-makefile.patch b/net-misc/vtun/files/vtun-2.6-makefile.patch
deleted file mode 100644
index 673ee527ce2d..000000000000
--- a/net-misc/vtun/files/vtun-2.6-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur vtun.orig/Makefile.in vtun/Makefile.in
---- vtun.orig/Makefile.in	2002-12-20 16:55:47.000000000 +0000
-+++ vtun/Makefile.in	2003-10-17 18:03:42.000000000 +0000
-@@ -28,7 +28,7 @@
- LEXFLAGS = -t 
- 
- INSTALL = @INSTALL@
--INSTALL_OWNER = -o root -g 0
-+DESTDIR =
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-@@ -77,24 +77,21 @@
- 	rm -f `cat vtun.drivers`	
- 
- install_man: 
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
--	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
--	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
--	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
--	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man8
-+	$(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
-+	$(INSTALL) -m 644 vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
- 
- install_config: 
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
--	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
--	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
--	fi
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
-+	$(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR);
-+	
- 
- install: vtund install_config install_man
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
--	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
--	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(VAR_DIR)/run
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(STAT_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
-+	$(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.