actually add the patch

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 63 insertions, 5 deletions

diff --git a/app-emulation/libspectrum/ChangeLog b/app-emulation/libspectrum/ChangeLog
index f52c0258fd48..f927a32e7ab8 100644
--- a/app-emulation/libspectrum/ChangeLog
+++ b/app-emulation/libspectrum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libspectrum
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/ChangeLog,v 1.25 2009/01/25 02:40:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/ChangeLog,v 1.26 2009/01/25 17:38:35 darkside Exp $
+
+  25 Jan 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/libspectrum-0.5.0.1-without-bzip2_zlib.patch,
+  libspectrum-0.5.0.1.ebuild:
+  actually add the patch
 
   25 Jan 2009; Jeremy Olexa <darkside@gentoo.org>
   +files/libspectrum-0.5.0.1-without-bzip2_zlib.patch:
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index 424028a9f166..56c40896235d 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -4,6 +4,6 @@ DIST libspectrum-0.4.0.tar.gz 470513 RMD160 a1b70686512cdb6f198f5f3b022d075af2d1
 DIST libspectrum-0.5.0.1.tar.gz 490943 RMD160 e35280d6bc796f8c3c72a15dee0707c078a3e51d SHA1 b93bcb4a70901b0ca2cb2dfd028fb16c61842466 SHA256 fda2f69d54c9f4c96778b8a8c52e0151759a4aec9e7989b9684701791ba0560d
 EBUILD libspectrum-0.2.2-r1.ebuild 764 RMD160 cf47b5c6c41910261036118a469ec5f549280197 SHA1 90258c96059a28be26631f91d8605f26dd499752 SHA256 fe47107aa563d4f9c8ebfa7e055738ea2da50ca72d8e8536edb8aa4aed5f7396
 EBUILD libspectrum-0.4.0.ebuild 936 RMD160 60cb853257f70edf23b2d48c63ef2a88934f003d SHA1 3672a51724d4d6493ff973b797fb8304b253630d SHA256 381aefafbc38268c68cfb63ffe0ad1d146a6e190d648e1d6076d9252623d3bb9
-EBUILD libspectrum-0.5.0.1.ebuild 1199 RMD160 dcb3051e79c27b59a00c127fcc8a0a227740108b SHA1 04d78f5cc240a838cbb63e557ab0dc8370ca0145 SHA256 25c94907736edf483d71f8ca98aa494a223b63813238add25dd1f4c1930a1c03
-MISC ChangeLog 3766 RMD160 faa1b9c5a7486c345923d064cb1b47cc28ced77d SHA1 1e4c90310a328805c1b00bc55883a461423b7110 SHA256 818396a8250426de47da59de9f545659ed87f9bec43ffe42883de21aa6049015
+EBUILD libspectrum-0.5.0.1.ebuild 1232 RMD160 9bbba3067310790445a5f4ba072014ae43d909d0 SHA1 ffc768714618b7d6ba71f354f19d583c450bbf0f SHA256 9e5fb77ed712dd84fba5dee8e6ee32b937e33dd2a73a2bda1f7f87695cf89e49
+MISC ChangeLog 3927 RMD160 83f2692e99cb18dfc03a5ef142d9f73fdb344168 SHA1 60965fc3173c53b554c839427a81ddaebb63cfe6 SHA256 8ab8b8dd02b0cedd6bb86661196a1f98c0a74dbd3ca797fd87e0b4dcab3ee14c
 MISC metadata.xml 776 RMD160 f3d7ce3b6a65d7e05134a5a8eefa7d23d5b26c4e SHA1 48c27d40aa232a022fab57c209ffef581f50cb3d SHA256 cd0f13ddcf8daf912ab8ccbf2cba47fee9c540b9224d0573a2ef9f55d6a37e68
diff --git a/app-emulation/libspectrum/files/libspectrum-0.5.0.1-without-bzip2_zlib.patch b/app-emulation/libspectrum/files/libspectrum-0.5.0.1-without-bzip2_zlib.patch
new file mode 100644
index 000000000000..3eac75b9b842
--- /dev/null
+++ b/app-emulation/libspectrum/files/libspectrum-0.5.0.1-without-bzip2_zlib.patch
@@ -0,0 +1,52 @@
+--- libspectrum-0.5.0.1/configure.in	2009-01-14 20:50:55.000000000 +0100
++++ configure.in	2009-01-24 16:10:53.000000000 +0100
+@@ -65,11 +65,19 @@
+   CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib"
+ fi)
+ 
+-dnl Check for zlib (the UNIX version is called z, Win32 zdll)
+-AC_CHECK_HEADERS(
+-  zlib.h,
+-  AC_SEARCH_LIBS(compress2, z zdll)
+-)
++dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll)
++AC_MSG_CHECKING(whether to use zlib)
++AC_ARG_WITH(zlib,
++[  --without-zlib          don't use zlib],
++if test "$withval" = no; then zlib=no; else zlib=yes; fi,
++zlib=yes)
++AC_MSG_RESULT($zlib)
++if test "$zlib" = yes; then
++  AC_CHECK_HEADERS(
++    zlib.h,
++    AC_SEARCH_LIBS(compress2, z zdll)
++  )
++fi
+ 
+ dnl Check whether to use libgcrypt
+ AC_MSG_CHECKING(whether to use libgcrypt)
+@@ -82,11 +90,19 @@
+   AC_CHECK_HEADERS(gcrypt.h,LIBS="$LIBS -lgcrypt")
+ fi
+ 
+-dnl Check for libbz2 1.0 or greater
+-AC_CHECK_HEADER(
+-  bzlib.h,
+-  AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
+-)
++dnl Check whether to use libbz2 (1.0 or greater)
++AC_MSG_CHECKING(whether to use libbz2)
++AC_ARG_WITH(bzip2,
++[  --without-bzip2         don't use libbz2],
++if test "$withval" = no; then bzip2=no; else bzip2=yes; fi,
++bzip2=yes)
++AC_MSG_RESULT($bzip2)
++if test "$bzip2" = yes; then
++  AC_CHECK_HEADER(
++    bzlib.h,
++    AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
++  )
++fi
+ 
+ dnl Either find glib or use the replacement
+ AC_MSG_CHECKING(whether to use glib)
diff --git a/app-emulation/libspectrum/libspectrum-0.5.0.1.ebuild b/app-emulation/libspectrum/libspectrum-0.5.0.1.ebuild
index 6d5ceada60e0..d32040ccfece 100644
--- a/app-emulation/libspectrum/libspectrum-0.5.0.1.ebuild
+++ b/app-emulation/libspectrum/libspectrum-0.5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-0.5.0.1.ebuild,v 1.1 2009/01/25 02:35:58 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libspectrum/libspectrum-0.5.0.1.ebuild,v 1.2 2009/01/25 17:38:35 darkside Exp $
 
 inherit eutils autotools
 
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#submitted upstream, see bug #0000000000000000000000000000000000000000000000
+	#submitted upstream at:
+	# http://sf.net/tracker/index.php?func=detail&aid=2533274&group_id=91293&atid=596650
 	epatch "${FILESDIR}/${P}-without-bzip2_zlib.patch"
 	eautoreconf
 }