Removing 4.0 folder files too

Package-Manager: portage-2.0.52-r1

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index efdce25590458e77029478405cc81dec4dba2173..d8d28bac0d1ad8eb3694348c1e1e8687a60c956e 100644 (file)
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.57 2005/10/25 03:28:36 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.58 2005/10/25 04:13:25 morfic Exp $
+
+  25 Oct 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
+  Remove the 4.0 folder too
 
   25 Oct 2005; Daniel Goller <morfic@gentoo.org>
   -files/tightvnc-4.0_gcc-3.4.patch, -files/tightvnc_cvs20031113.patch.bz2,

diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index d93c1d1bf60775f5609ed2079fd5d2d8b8bb78e7..8537f5b934dd19ca3f57a3b76c77b579cfa45f26 100644 (file)
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6ef5c5e43d2f933b57882628bc221a9e ChangeLog 7729
+MD5 f83cd0482d322cf8ea294bbb1bce4756 ChangeLog 7818
 MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309
 MD5 ad61c2374702756a5341de9f1a63efda tightvnc-1.2.8.ebuild 1595
 MD5 3cc698e0e4dc7d3c778411161b5af86d tightvnc-1.2.9-r1.ebuild 1717
@@ -27,13 +27,10 @@ MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha7-gentoo.security.p
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
 MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
 MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
-MD5 19c42aff4dfa179a0b028316e845e14f files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch 949
-MD5 55068075897cef6ddd710f410ba25c21 files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
-MD5 da10d05f6a76bdc27a59276c0acde9d9 files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch 364
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXaZ2/aM9DdBw91cRAoYqAKC1XoSAqAUbnsWkwtzLhW+U2pbAGACfcE1f
-z2R7Bb2C2HT66y/Ftj1ehPY=
-=HuE1
+iD8DBQFDXbDz/aM9DdBw91cRAjHjAKDffiNYmVaQrYFQWPsiecdUhYW9iACdFQII
+FCyWnvDFH9OUgpTs2H78LoY=
+=Ycb8
 -----END PGP SIGNATURE-----

diff --git a/net-misc/tightvnc/files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch b/net-misc/tightvnc/files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch
deleted file mode 100644 (file)
index a900c48..0000000
--- a/net-misc/tightvnc/files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- XFree86-4.2.99.3/xc/lib/Xau/Imakefile.build-libs-with-pic  2001-01-17 14:42:24.000000000 -0500
-+++ XFree86-4.2.99.3/xc/lib/Xau/Imakefile      2003-01-09 11:25:46.000000000 -0500
-@@ -37,6 +37,8 @@ SRCS =       AuDispose.c AuFileName.c AuGetAdd
- OBJS =        AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
-       AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
- 
-+#define IncludeNormalLibInSharedObject
-+
- #include <Library.tmpl>
- 
- DependTarget()
---- XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/parser/Imakefile.build-libs-with-pic       2002-05-31 14:46:02.000000000 -0400
-+++ XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/parser/Imakefile   2003-01-09 11:25:51.000000000 -0500
-@@ -36,6 +36,8 @@ CONFIG_DEFINES = -DXCONFIGDIR=\"$(XCONFI
-                -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
-                -DXVERSION="$(XVERS)"
- 
-+#define IncludeNormalLibInSharedObject
-+
- #include <Library.tmpl>
- 
- SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))

diff --git a/net-misc/tightvnc/files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch b/net-misc/tightvnc/files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
deleted file mode 100644 (file)
index d3090f0..0000000
--- a/net-misc/tightvnc/files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- xc/lib/Xau/Imakefile.IncludeSharedObjectInNormalLib        2001-01-17 14:42:24.000000000 -0500
-+++ xc/lib/Xau/Imakefile       2003-01-29 02:25:49.000000000 -0500
-@@ -37,6 +37,8 @@
- OBJS =        AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
-       AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
- 
-+#define IncludeSharedObjectInNormalLib
-+
- #include <Library.tmpl>
- 
- DependTarget()
---- xc/lib/xkbfile/Imakefile.IncludeSharedObjectInNormalLib    2001-08-27 13:40:59.000000000 -0400
-+++ xc/lib/xkbfile/Imakefile   2003-01-29 02:25:49.000000000 -0500
-@@ -34,6 +34,8 @@
- 
- ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
- 
-+#define IncludeSharedObjectInNormalLib
-+
- #include <Library.tmpl>
- 
- DependTarget()
---- xc/lib/xkbui/Imakefile.IncludeSharedObjectInNormalLib      1999-03-13 22:21:21.000000000 -0500
-+++ xc/lib/xkbui/Imakefile     2003-01-29 02:25:49.000000000 -0500
-@@ -15,6 +15,8 @@
-          HEADERS = XKBui.h
-         INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile
- 
-+#define IncludeSharedObjectInNormalLib
-+
- #include <Library.tmpl>
- 
- DependTarget()
---- xc/programs/Xserver/hw/xfree86/parser/Imakefile.IncludeSharedObjectInNormalLib     2003-01-29 02:41:13.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/parser/Imakefile    2003-01-29 02:41:53.000000000 -0500
-@@ -36,9 +36,11 @@
-                -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
-                -DXVERSION="$(XVERS)"
- 
-+#define IncludeSharedObjectInNormalLib
-+
- #include <Library.tmpl>
- 
--SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
-+SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) $(PICFLAGS))
- 
- NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)
- 

diff --git a/net-misc/tightvnc/files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch b/net-misc/tightvnc/files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch
deleted file mode 100644 (file)
index 5b8950d..0000000
--- a/net-misc/tightvnc/files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/config/cf/linux.cf.x86_64-glx-nopic     2003-01-29 00:45:16.000000000 -0500
-+++ xc/config/cf/linux.cf      2003-01-29 00:45:57.000000000 -0500
-@@ -319,7 +319,7 @@
-  * This improves performance.
-  */
- #if BuildXF86DRI
--# if defined(i386Architecture)
-+# if defined(i386Architecture) || defined(x86_64Architecture)
- #  define BuildLibGlxWithoutPIC       YES
- # endif
- #endif