use system zlib. solving bug #246968.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 74 insertions, 1 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/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
+}