Be more complete with the zlib remove.

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

3 files changed, 10 insertions, 7 deletions

diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 60916bc3c2cb..99e3e86ecbce 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,5 +1,5 @@
-AUX milkytracker-0.90.80-external_zlib.patch 5163 RMD160 7e5e296ae87e66b520722b2c94407e6c54725f4b SHA1 941a60b7e5fbe25dfbf65cb4dda23a695baf64f8 SHA256 b94d44a4256325748c2d2f7c5dc440589cf7932000425b7deb526e4b9d1401ca
+AUX milkytracker-0.90.80-external_zlib.patch 5839 RMD160 2d47ba374e6fe9e606f3102479ceb8e1be4c49a3 SHA1 64f8e02fe663d595f64c1abdfe0c7c94bfb37e25 SHA256 0d5d249313e9c86bf8663deaadf97ca4310b880c0c4e652cddb4764e544bbc70
 DIST milkytracker-0.90.80.tar.bz2 1799270 RMD160 cb535a50c29b8d722617007054921065e71c1615 SHA1 e6adedee56a6a1bf096b5311c319954ea54977dc SHA256 7cd804abead650c86d00014ccc086fa3d67a4c9c2c34cec3d4f26bbaac41a078
-EBUILD milkytracker-0.90.80.ebuild 1089 RMD160 f016fa90b6dc693f84d998d8d7ac531e0ba573b4 SHA1 c1a53dd126b511c85bceadcb37c85b730729712b SHA256 f8a8b217429bda7ccf40e948b4c4645691c65efcf1ac0c8787b7715a1a7384bf
+EBUILD milkytracker-0.90.80.ebuild 1140 RMD160 65894ff26b4958222bdaaaee38e994a16239b79e SHA1 e7a57c9cc12e4f1e10ab68839272ca1718f1bcf9 SHA256 181af7fe40ceb8ff32aa312573022a38b56e59c960a5761fb7d81d516d0d325c
 MISC ChangeLog 575 RMD160 dcbf4987eb91eef7fbfe99fe1511932c75034436 SHA1 e3d2e619c8fe4609bae90c6d019b0a928b7fcf90 SHA256 ab5a358d219b6a519ecf97be465711dca20bb7ed78f24d8443a435880f871ff7
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch b/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
index 73f79430f751..cc3adb5ee96f 100644
--- a/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
+++ b/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
@@ -1,12 +1,14 @@
 diff -ur milkytracker-0.90.80.orig/src/compression/Makefile.am milkytracker-0.90.80/src/compression/Makefile.am
 --- milkytracker-0.90.80.orig/src/compression/Makefile.am	2008-01-25 00:44:27.000000000 +0200
-+++ milkytracker-0.90.80/src/compression/Makefile.am	2009-07-22 09:17:49.000000000 +0300
-@@ -1,5 +1,5 @@
++++ milkytracker-0.90.80/src/compression/Makefile.am	2009-07-22 09:52:08.000000000 +0300
+@@ -1,5 +1,6 @@
++#zziplib has been customized, so we can't use system copy.
  noinst_LIBRARIES = libcompression.a
 -libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
-+libcompression_a_SOURCES = zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
- noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
+-noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
 -INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic
++libcompression_a_SOURCES = zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
++noinst_HEADERS = zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
 +INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic
  #INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix
 diff -ur milkytracker-0.90.80.orig/src/tracker/Makefile.am milkytracker-0.90.80/src/tracker/Makefile.am
diff --git a/media-sound/milkytracker/milkytracker-0.90.80.ebuild b/media-sound/milkytracker/milkytracker-0.90.80.ebuild
index a57049e13041..41d4b735f1ab 100644
--- a/media-sound/milkytracker/milkytracker-0.90.80.ebuild
+++ b/media-sound/milkytracker/milkytracker-0.90.80.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/media-sound/milkytracker/milkytracker-0.90.80.ebuild,v 1.6 2009/07/22 06:22:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/milkytracker/milkytracker-0.90.80.ebuild,v 1.7 2009/07/22 06:53:32 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -20,6 +20,7 @@ RDEPEND=">=media-libs/libsdl-1.2
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	rm -rf src/compression/zlib || die "rm -f failed"
 	epatch "${FILESDIR}"/${P}-external_zlib.patch
 	eautoreconf
 }