--- zlib-1.2.5.ebuild.org	2010-04-20 23:05:05.940363466 +0300
+++ zlib-1.2.5.ebuild	2010-04-20 23:14:40.187448700 +0300
@@ -19,8 +19,6 @@ RDEPEND="!<dev-libs/libxml2-2.7.7" #3096
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.4-visibility-support.patch #149929
-	epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
 	# trust exit status of the compiler rather than stderr #55434
 	# -if test "`(...) 2>&1`" = ""; then
 	# +if (...) 2>/dev/null; then
@@ -30,7 +28,7 @@ src_unpack() {
 src_compile() {
 	case ${CHOST} in
 	*-mingw*|mingw*)
-		emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die
+		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
 		;;
 	*)	# not an autoconf script, so cant use econf
 		./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
@@ -40,14 +38,20 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" LDCONFIG=: || die
-	dodoc FAQ README ChangeLog doc/*.txt
-
 	case ${CHOST} in
-	*-mingw*|mingw*)
-		dobin zlib1.dll || die
-		dolib libz.dll.a || die
-		;;
-	*) gen_usr_ldscript -a z ;;
+		*-mingw*|mingw*)
+			emake -f win32/Makefile.gcc install \
+				BINARY_PATH="${D}/usr/bin" \
+				LIBRARY_PATH="${D}/usr/$(get_libdir)" \
+				INCLUDE_PATH="${D}/usr/include" \
+				SHARED_MODE=1 \
+				|| die
+			;;
+		*)
+			emake install DESTDIR="${D}" LDCONFIG=: || die
+			gen_usr_ldscript -a z
+			;;
 	esac
+
+	dodoc FAQ README ChangeLog doc/*.txt
 }