Disabled the rediffed patch, it's broken. Put an ewarn there instead.

Package-Manager: portage-2.1_pre6-r1

diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index 4217c6a0bef4fe4b92affb6ecd7999b550870979..2168bd218bb65df39d0310fa4232ce0153e1c5d7 100644 (file)
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/ucspi-tcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.42 2006/03/12 18:32:48 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.43 2006/03/14 19:06:46 hansmi Exp $
+
+  14 Mar 2006; Michael Hanselmann <hansmi@gentoo.org>
+  ucspi-tcp-0.88-r14.ebuild:
+  Disabled the rediffed patch, it's broken. Put an ewarn there instead.
 
 *ucspi-tcp-0.88-r14 (12 Mar 2006)
 

diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 1f7e00e75461f92659438d030af4c95de2ed25d1..daed56940ee4d635284ff1983f2c1bfe8fac43d1 100644 (file)
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,6 +1,6 @@
-MD5 f426b3ce5411a0cdd9b9a49fa1e0c665 ChangeLog 6173
-RMD160 c8d41f54be8435cccd25a8583cee22a14de45124 ChangeLog 6173
-SHA256 2e05073cb13b81e1d3abd938bea8df4a45cc63f78b10286d70fc2b84dfb190e1 ChangeLog 6173
+MD5 b7312edb39acf9b76447217ab839e796 ChangeLog 6329
+RMD160 c146ae97149471ac8c9bfd7808e7412d18a38deb ChangeLog 6329
+SHA256 851cd9f725276c4c71a573cbea0b0b5bb04855af820dfffd00240ecf5082b122 ChangeLog 6329
 MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
 RMD160 65025a0a97e83bf920353c874ae0c484660c7d4b files/0.88-bigendian.patch 478
 SHA256 843738c0888c3072605dea0c536f5dc0f3ed2779a1cd7e0e959ccd2e4e705b6c files/0.88-bigendian.patch 478
@@ -58,9 +58,9 @@ SHA256 08f6c3a17201006fb0aaa7922b2abe62034be48d9c46a7572e051451760ca688 ucspi-tc
 MD5 31a2a67e361969a49292fa865de144cf ucspi-tcp-0.88-r13.ebuild 2623
 RMD160 f6bd35916a4cab50ef254451830760a0b023a6d4 ucspi-tcp-0.88-r13.ebuild 2623
 SHA256 4d68b7605d884ff1def0ccfd55548ab29429064a3ebf459159672440d40a35d3 ucspi-tcp-0.88-r13.ebuild 2623
-MD5 2262b7a6f90adfef5a02451cbf68db75 ucspi-tcp-0.88-r14.ebuild 2562
-RMD160 3c98b32de91186eb18b20c2711562af29f868c21 ucspi-tcp-0.88-r14.ebuild 2562
-SHA256 cd3ff560d2e219f109208d9e7252ded5db3e124c8d860ab8ab321e60c8d49a53 ucspi-tcp-0.88-r14.ebuild 2562
+MD5 c4aa17c072224ff95a2b5a182b3bcec7 ucspi-tcp-0.88-r14.ebuild 2744
+RMD160 79052edf2b510f5a75f8935b31e1efd05a2e1413 ucspi-tcp-0.88-r14.ebuild 2744
+SHA256 cf378fe6cef52bac5e924138a3b37734d3ac3df8d80c4c1fe90765f99c83177c ucspi-tcp-0.88-r14.ebuild 2744
 MD5 6d6eeeea3f3e9764796103a945a665f8 ucspi-tcp-0.88-r8.ebuild 2155
 RMD160 28275bc5d26c04228c6e8b8d7d90b23f667eac1e ucspi-tcp-0.88-r8.ebuild 2155
 SHA256 b8ac8fff57b579be092a858b06030e2c59938529e1b071331fb8b343efb7e4bf ucspi-tcp-0.88-r8.ebuild 2155

diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild
index ce43fc972b86769a25bcef48d978d27df02a26ce..e7d2422f0fef24fe31ea6f3b3d25974f246d5fa7 100644 (file)
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild,v 1.1 2006/03/12 18:32:48 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r14.ebuild,v 1.2 2006/03/14 19:06:46 hansmi Exp $
 
 inherit eutils toolchain-funcs fixheadtails
 
@@ -45,7 +45,13 @@ src_unpack() {
        if use ssl; then
                if use ipv6 ; then
                        # Rediffed patch by hansmi@g.o
-                       epatch ${DISTDIR}/ucspi-tcp-0.88-ipv6-ssl-20050405.patch
+                       # -> broken, hansmi on 2006-03-14
+                       # epatch ${DISTDIR}/ucspi-tcp-0.88-ipv6-ssl-20050405.patch
+                       echo
+                       ewarn "SSL support disabled when using IPv6!"
+                       ewarn "Please supply us a patch or wait until someone else does."
+                       ebeep
+                       echo
                else
                        epatch ${DISTDIR}/ucspi-tcp-ssl-20050405.patch.gz
                fi