use system zlib. solving bug #246968.

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

4 files changed, 77 insertions, 2 deletions

diff --git a/app-text/mbtpdfasm/ChangeLog b/app-text/mbtpdfasm/ChangeLog
index e260adbf339a..1c990e9f67fd 100644
--- a/app-text/mbtpdfasm/ChangeLog
+++ b/app-text/mbtpdfasm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/mbtpdfasm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/ChangeLog,v 1.7 2010/07/20 23:18:09 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/ChangeLog,v 1.8 2010/07/20 23:20:53 sbriesen Exp $
+
+*mbtpdfasm-1.0.28-r1 (20 Jul 2010)
+
+  20 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org>
+  +mbtpdfasm-1.0.28-r1.ebuild, +files/mbtpdfasm-1.0.28-zlib.diff:
+  use system zlib. solving bug #246968.
 
   20 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org>
   -files/mbtpdfasm-1.0.26-64bit.patch:
diff --git a/app-text/mbtpdfasm/Manifest b/app-text/mbtpdfasm/Manifest
index 6cb52d62a61e..0d7a7c0a05b9 100644
--- a/app-text/mbtpdfasm/Manifest
+++ b/app-text/mbtpdfasm/Manifest
@@ -1,8 +1,10 @@
 AUX mbtpdfasm-1.0.28-64bit.diff 1461 RMD160 05738e53a55e8044b532e9f0f5617cb5f8bea565 SHA1 56d441ac94d3c4fdb6e78797320e5b6d49ec05fa SHA256 2a7163a174ca92f6f60a14a3db3ed4cc4e865db72080acfc2d8f13d86bc54023
 AUX mbtpdfasm-1.0.28-main.diff 402 RMD160 04bcda2647f6b742a42d7d4ae9653452ee2fde7a SHA1 eee20c1d676d56c6d25b52aebb6a42f09307370a SHA256 2994c8d474a1496a4405e35b8185bcb43f05557450d859cf1682af7f8f9ea245
 AUX mbtpdfasm-1.0.28-makefile.diff 3935 RMD160 20d342b42b3d5c635501697aa31b09ac9e8a9170 SHA1 8dd3f529490054f0196d47a5f85da4b1fe165b6f SHA256 2e14079109308ada8885259d4ad8a2b11c4e08926a117fae68471d435b6f5857
+AUX mbtpdfasm-1.0.28-zlib.diff 1242 RMD160 705e8dfa9cf038c136c7347da275a2ed64fec656 SHA1 215ee4c42b5fe3c08fe51454db3ad32d10eb585c SHA256 5315bd876c7d28c3bb843b00bdf08349740604fbb33618618039b540e82096d7
 DIST mbtPdfAsm-1.0.28.tar.gz 253032 RMD160 f7147a2a5d996a691e41997e8e5a03eae6071326 SHA1 82dbb5ed368e1003a9092a283a0845da1fbb6b76 SHA256 e416aab7d805308f82f3cbe91f964eab6be5da8a232bd52e13a048740194048f
 DIST mbtpdfasm-1.0.28-manual.pdf.bz2 6581 RMD160 7ef2032791c219c5aa81db8d8fef75e5fc21c24b SHA1 9c2a6ad273957d45280b01df89a96cb1d1433e48 SHA256 648a21a665098815dc0ae9ec1b2faa8f24a0e99ab64af1dbadf54515959cff89
+EBUILD mbtpdfasm-1.0.28-r1.ebuild 1164 RMD160 3f7c31ec89deda4cb0c87199144122e5dd187dd3 SHA1 3d358b191e3aa870ce4b4bc57d8db21aed54634e SHA256 98bb308ea8abae344aef860d1968db16315d39c2206bf08be620f4cf4c2d9aab
 EBUILD mbtpdfasm-1.0.28.ebuild 1081 RMD160 21b0bee10b8ee676364705f8dc6e2647f1cb16d0 SHA1 48870ccf22f847d13d3f4beadfa0827ca7d23b03 SHA256 d62ab7ccf5b6745492f906d64a7b07ac431d9c93473d22998fc61a70ab2dc737
-MISC ChangeLog 1449 RMD160 08782bea65e9081fa51923ddcea83bfdb50adcc7 SHA1 e10c465f73060f76958c22377748242e5e5a007c SHA256 4b6bd191e34253914704364998922f03bf52a8b451750d9814dece2bfe30f75f
+MISC ChangeLog 1647 RMD160 b69944c7ee1fa3df1b51849203c808c3fe9c978c SHA1 b6ec5dfbfe0d93ea8598c4068cbccba984ca4273 SHA256 a3757935ab42db89e18d5dadb6646e6135dbdbe96b448819d68f6633c86736cc
 MISC metadata.xml 441 RMD160 7ccad357d6ccf4e61917d0855832f618df01298b SHA1 3c693af4a4e142c5546f8e6cb4b9ea37e6a43f4e SHA256 1f8a618fe12a4ba9d5166ba0f4ed5b163df45137f93dcc665e06fab1599e6281
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
new file mode 100644
index 000000000000..02446ae6ea7a
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
@@ -0,0 +1,26 @@
+diff -Naur work.orig/makefile work/makefile
+--- work.orig/makefile	2010-07-21 01:11:54.390456452 +0200
++++ work/makefile	2010-07-21 01:12:22.843456093 +0200
+@@ -9,8 +9,8 @@
+ LF = $(O)/main.o $(O)/pdfFile.o $(O)/pdfXrefTable.o $(O)/string.o $(O)/rc4.o $(O)/md5.o $(O)/pdfString.o $(O)/listeFichiers_linux.o $(O)/diversPdf.o $(O)/strMatcher.o $(O)/pcre.o $(O)/study.o $(O)/get.o $(O)/maketables.o $(O)/pdfEncrypt.o $(O)/pdfFileOutline.o $(O)/pdfNames.o $(O)/pdfObject.o $(O)/calc.o
+ ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
+ #
+-$(EXENAME): $(LF) $(ZLIB)
+-	$(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
++$(EXENAME): $(LF)
++	$(CC) $(LDFLAGS) $(LF) -lz -o $@
+ $(O)/main.o: main.cpp
+ 	$(CC) $(CXXFLAGS) -c main.cpp -o $*.o
+ $(O)/pdfFile.o: pdfFile.cpp
+diff -Naur work.orig/pdfObject.cpp work/pdfObject.cpp
+--- work.orig/pdfObject.cpp	2007-08-22 20:13:56.000000000 +0200
++++ work/pdfObject.cpp	2010-07-21 01:11:54.486455713 +0200
+@@ -1,7 +1,7 @@
+ #include "pdfObject.hpp"

+ #include "pdfXrefTable.hpp"

+ #include "diversPdf.hpp"

+-#include "zlib.h"

++#include <zlib.h>

+ #include <stdlib.h>

+ 

+ #ifdef DEBUG_MEM_LEAK

diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
new file mode 100644
index 000000000000..4d1e1657ff8c
--- /dev/null
+++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild,v 1.1 2010/07/20 23:20:53 sbriesen Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P="mbtPdfAsm-${PV}"
+
+DESCRIPTION="mbtPdfAsm can assemble/merge PDF files, extract information from PDF files, and update the metadata in PDF files."
+HOMEPAGE="http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html"
+SRC_URI="http://thierry.schmit.free.fr/spip/IMG/gz/${MY_P}.tar.gz
+	http://sbriesen.de/gentoo/distfiles/${P}-manual.pdf.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile.diff"
+	epatch "${FILESDIR}/${P}-64bit.diff"
+	epatch "${FILESDIR}/${P}-main.diff"
+
+	# use system zlib
+	epatch "${FILESDIR}/${P}-zlib.diff"
+	mv -f "zlib.h" "zlib.h.disabled"
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	dobin mbtPdfAsm || die "install failed"
+	insinto "/usr/share/doc/${PF}"
+	newins ${P}-manual.pdf mbtPdfAsm.pdf
+}