Modified the patch so that it does not fail with stable patch. Fixes bug #112544.

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index e6014b6975a96fb00a06734ad33db55253281fd1..f01afbedcdb5fb96503352530db6feb309dabf30 100644 (file)
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,11 +1,10 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.44 2005/11/14 20:50:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.45 2005/11/14 21:36:44 betelgeuse Exp $
 
-  14 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
-  gnu-classpath-0.19.ebuild:
-  Added dependency on the latest sys-devel/patch because the dssi patch fails
-  without it.
+  14 Nov 2005; Petteri Räty <betelgeuse@gentoo.org> files/0.19-dssi.patch:
+  Modified the patch so that it does not fail with stable patch. Fixes bug
+  #112544.
 
 *gnu-classpath-0.19 (11 Nov 2005)
 

diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index f4299d7cc1a0f97e917d854bc59f7480fab4c71f..70365e7cd07977174637f368ea602e54ed6fde51 100644 (file)
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 663492938507ccdda770df7344e57270 ChangeLog 6514
-MD5 50601eed7ae1e20d101af4a58b903946 files/0.19-dssi.patch 1443
+MD5 347a938600ce9b7947b94dfe47bea836 ChangeLog 6502
+MD5 4c21037c9eaf2d9fe12e88ced8caab80 files/0.19-dssi.patch 1410
 MD5 7e2cbdd8bd825a0e9b8fff8312f08c23 files/0.19-dssi_data.h 4174
 MD5 9b2c43cfbb9e8d325407a9ddd2068a5d files/digest-gnu-classpath-0.14 67
 MD5 2690159fdd3e679de05cd6daed73f4da files/digest-gnu-classpath-0.15-r1 67
@@ -12,12 +12,12 @@ MD5 887f044e4350323f1324cc1368943c1a files/gtk28.patch 1522
 MD5 f076bc9c2bfe9d094c6255f2beec9abc gnu-classpath-0.14.ebuild 1195
 MD5 d04460407e0f569ab509eaf458ae97f3 gnu-classpath-0.15-r1.ebuild 1638
 MD5 b906f7e1050511b7a12b99e9b79d5d3b gnu-classpath-0.18.ebuild 1927
-MD5 0f0c4be71612f025d95f9fe9b103377b gnu-classpath-0.19.ebuild 2377
+MD5 952fe51754df87b3e8065dab93892115 gnu-classpath-0.19.ebuild 2307
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDePiMQiJ/wx066S4RAuG2AJ93Kz0jiZRUr5yLTrPPBYR1qPKiCgCfUqYi
-gTWc0t+a5k1e6oXqyeaiTWg=
-=73B9
+iD8DBQFDeQOcQiJ/wx066S4RAq6mAJ4lrpat/8nm86HOiEUNlRj/g3CpTQCfTjoF
+g0I0S4AO7abykqum+1vtYQw=
+=e3MT
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gnu-classpath/files/0.19-dssi.patch b/dev-java/gnu-classpath/files/0.19-dssi.patch
index be7eaf01a589f44cf5c79c86f4860c007f60dcf5..7f8bf06d3ca96608cb5cca1b7e85fe34dd0f9ff0 100644 (file)
--- a/dev-java/gnu-classpath/files/0.19-dssi.patch
+++ b/dev-java/gnu-classpath/files/0.19-dssi.patch
@@ -1,33 +1,33 @@
-Index: configure.ac\r
-===================================================================\r
-RCS file: /cvsroot/classpath/classpath/configure.ac,v\r
-retrieving revision 1.118\r
-diff -u -r1.118 configure.ac\r
---- configure.ac       7 Nov 2005 14:25:54 -0000       1.118\r
-+++ configure.ac       10 Nov 2005 10:50:23 -0000\r
-@@ -118,7 +118,7 @@\r
- dnl -----------------------------------------------------------\r
- dnl DSSI code (enabled by default)\r
- dnl -----------------------------------------------------------\r
--AC_ARG_ENABLE([alsa],\r
-+AC_ARG_ENABLE([dssi],\r
-               [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by --enable-dssi) [default=yes])],\r
-               [case "${enableval}" in\r
-                 yes) COMPILE_DSSI=yes ;;\r
-Index: native/jni/midi-dssi/Makefile.am\r
-===================================================================\r
-RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v\r
-retrieving revision 1.2\r
-diff -u -r1.2 Makefile.am\r
---- native/jni/midi-dssi/Makefile.am   23 Oct 2005 16:59:09 -0000      1.2\r
-+++ native/jni/midi-dssi/Makefile.am   10 Nov 2005 10:50:23 -0000\r
-@@ -1,7 +1,8 @@\r
- nativelib_LTLIBRARIES = libgjsmdssi.la \r
- \r
- libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \\r
--gnu_javax_sound_midi_dssi_DSSISynthesizer.c\r
-+                       gnu_javax_sound_midi_dssi_DSSISynthesizer.c \\r
-+                       dssi_data.h\r
- \r
- libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack\r
- \r
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/classpath/classpath/configure.ac,v
+retrieving revision 1.118
+diff -u -r1.118 configure.ac
+--- configure.ac       7 Nov 2005 14:25:54 -0000       1.118
++++ configure.ac       10 Nov 2005 10:50:23 -0000
+@@ -118,7 +118,7 @@
+ dnl -----------------------------------------------------------
+ dnl DSSI code (enabled by default)
+ dnl -----------------------------------------------------------
+-AC_ARG_ENABLE([alsa],
++AC_ARG_ENABLE([dssi],
+               [AS_HELP_STRING(--disable-dssi,compile DSSI providers (enable by --enable-dssi) [default=yes])],
+               [case "${enableval}" in
+                 yes) COMPILE_DSSI=yes ;;
+Index: native/jni/midi-dssi/Makefile.am
+===================================================================
+RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am
+--- native/jni/midi-dssi/Makefile.am   23 Oct 2005 16:59:09 -0000      1.2
++++ native/jni/midi-dssi/Makefile.am   10 Nov 2005 10:50:23 -0000
+@@ -1,7 +1,8 @@
+ nativelib_LTLIBRARIES = libgjsmdssi.la 
+ 
+ libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
+-gnu_javax_sound_midi_dssi_DSSISynthesizer.c
++                       gnu_javax_sound_midi_dssi_DSSISynthesizer.c \
++                       dssi_data.h
+ 
+ libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+ 

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
index c2b423fe4fef733da04d940ef7787005198ef0c3..916e0b24c7afa198ab3460d3cddaa9760ffdbe04 100644 (file)
--- a/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild,v 1.2 2005/11/14 20:50:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild,v 1.3 2005/11/14 21:36:44 betelgeuse Exp $
 
 inherit eutils autotools
 
@@ -27,10 +27,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
                     )
                xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
-# dssi patch fails with the stable patch
 DEPEND="app-arch/zip
                dev-java/jikes
-               >=sys-devel/patch-2.5.9-r1
                ${REPEND}"
 
 S=${WORKDIR}/${MY_P}