version bump.

(Portage version: 2.1.4_rc14)

6 files changed, 202 insertions, 2 deletions

diff --git a/app-text/mbtpdfasm/ChangeLog b/app-text/mbtpdfasm/ChangeLog
index 3d2fb4892fe8..62ac23e6bd46 100644
--- a/app-text/mbtpdfasm/ChangeLog
+++ b/app-text/mbtpdfasm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/mbtpdfasm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/ChangeLog,v 1.3 2006/07/26 16:38:37 sbriesen Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/ChangeLog,v 1.4 2008/01/06 02:37:18 sbriesen Exp $
+
+*mbtpdfasm-1.0.28 (06 Jan 2008)
+
+  06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/mbtpdfasm-1.0.28-64bit.diff, +files/mbtpdfasm-1.0.28-main.diff,
+  +files/mbtpdfasm-1.0.28-makefile.diff, +mbtpdfasm-1.0.28.ebuild:
+  version bump.
 
 *mbtpdfasm-1.0.26-r2 (26 Jul 2006)
 
diff --git a/app-text/mbtpdfasm/files/digest-mbtpdfasm-1.0.28 b/app-text/mbtpdfasm/files/digest-mbtpdfasm-1.0.28
new file mode 100644
index 000000000000..8379b5651172
--- /dev/null
+++ b/app-text/mbtpdfasm/files/digest-mbtpdfasm-1.0.28
@@ -0,0 +1,6 @@
+MD5 b08857f4ce058624a6aab022b1df3acd mbtPdfAsm-1.0.28.tar.gz 253032
+RMD160 f7147a2a5d996a691e41997e8e5a03eae6071326 mbtPdfAsm-1.0.28.tar.gz 253032
+SHA256 e416aab7d805308f82f3cbe91f964eab6be5da8a232bd52e13a048740194048f mbtPdfAsm-1.0.28.tar.gz 253032
+MD5 f02ae1fcb4d02a7180436b1c2639f681 mbtpdfasm-1.0.28-manual.pdf.bz2 6581
+RMD160 7ef2032791c219c5aa81db8d8fef75e5fc21c24b mbtpdfasm-1.0.28-manual.pdf.bz2 6581
+SHA256 648a21a665098815dc0ae9ec1b2faa8f24a0e99ab64af1dbadf54515959cff89 mbtpdfasm-1.0.28-manual.pdf.bz2 6581
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
new file mode 100644
index 000000000000..bd63327f29a5
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
@@ -0,0 +1,37 @@
+--- pdfFile.hpp.orig	2007-07-26 16:32:50.000000000 +0200
++++ pdfFile.hpp	2007-10-05 22:40:50.000000000 +0200
+@@ -161,7 +161,7 @@
+ 

+       //int findInheritRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);

+       int makeRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);

+-      int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, char *add, int lgAdd);

++      int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, int add, int lgAdd);

+ 

+       bool fast; // version rapide, on ne gère pas les options

+       bool closed; //protection plus rien n'est possible aprés l'appel à la fonction close

+--- pdfFile.cpp.orig	2007-08-22 20:44:31.000000000 +0200
++++ pdfFile.cpp	2007-10-05 22:42:39.000000000 +0200
+@@ -934,7 +934,7 @@
+ /* ********************************************** */
+ #pragma warning(disable : 4100)
+ 
+-int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, char *add, int lgAdd) {
++int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, int add, int lgAdd) {
+ char *pc;
+ int lgRes, lgBuf, j, nObj, r;
+ 
+@@ -973,12 +973,12 @@
+    }
+ 
+    if ( (lgAdd != 0) && (add != 0) ) {
+-      switch ( (int)add ) {
++      switch ( add ) {
+       case _Resources:
+ 
+          break;
+       default:
+-         memcpy(pc + lgRes, add + sizeof(int), lgAdd);
++         memcpy(pc + lgRes, (char *)add + sizeof(int), lgAdd);
+          lgRes += lgAdd;
+       }
+    }
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
new file mode 100644
index 000000000000..99b109d59332
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
@@ -0,0 +1,11 @@
+--- main.cpp.orig	2007-07-30 15:25:27.000000000 +0200
++++ main.cpp	2007-10-05 22:49:29.000000000 +0200
+@@ -52,7 +52,7 @@
+ char tc[1000];

+ int i;

+ 

+-   fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s", strVersion, strMPAURL);

++   fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s\n", strVersion, strMPAURL);

+ 

+    return 0;

+ }

diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
new file mode 100644
index 000000000000..278a3c03779b
--- /dev/null
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
@@ -0,0 +1,101 @@
+--- makefile.orig	2007-07-26 19:33:54.000000000 +0200
++++ makefile	2007-10-05 22:54:31.000000000 +0200
+@@ -10,66 +10,66 @@
+ 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) $(LF) $(ZLIB) -o $@
++	$(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
+ $(O)/main.o: main.cpp
+-	$(CC) -c main.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c main.cpp -o $*.o
+ $(O)/pdfFile.o: pdfFile.cpp
+-	$(CC) -c pdfFile.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfFile.cpp -o $*.o
+ $(O)/pdfObject.o: pdfObject.cpp
+-	$(CC) -c pdfObject.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfObject.cpp -o $*.o
+ $(O)/pdfEncrypt.o: pdfEncrypt.cpp
+-	$(CC) -c pdfEncrypt.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfEncrypt.cpp -o $*.o
+ $(O)/pdfNames.o: pdfNames.cpp
+-	$(CC) -c pdfNames.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfNames.cpp -o $*.o
+ $(O)/pdfFileOutline.o: pdfFileOutline.cpp
+-	$(CC) -c pdfFileOutline.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfFileOutline.cpp -o $*.o
+ $(O)/pdfXrefTable.o: pdfXrefTable.cpp
+-	$(CC) -c pdfXrefTable.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfXrefTable.cpp -o $*.o
+ $(O)/string.o: string.cpp
+-	$(CC) -c string.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c string.cpp -o $*.o
+ $(O)/pdfString.o: pdfString.cpp
+-	$(CC) -c pdfString.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c pdfString.cpp -o $*.o
+ $(O)/rc4.o: rc4.cpp
+-	$(CC) -c rc4.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c rc4.cpp -o $*.o
+ $(O)/md5.o: md5.c
+-	$(CC) -c md5.c -o $*.o
++	$(CC) $(CXXFLAGS) -c md5.c -o $*.o
+ $(O)/listeFichiers_linux.o: listeFichiers_linux.cpp
+-	$(CC) -c listeFichiers_linux.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c listeFichiers_linux.cpp -o $*.o
+ $(O)/diversPdf.o: diversPdf.cpp
+-	$(CC) -c diversPdf.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c diversPdf.cpp -o $*.o
+ $(O)/strMatcher.o: strMatcher.cpp
+-	$(CC)  -c strMatcher.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c strMatcher.cpp -o $*.o
+ $(O)/pcre.o: pcre.c
+-	$(CC) -c pcre.c -o $*.o
++	$(CC) $(CXXFLAGS) -c pcre.c -o $*.o
+ $(O)/study.o: study.c
+-	$(CC) -c study.c -o $*.o
++	$(CC) $(CXXFLAGS) -c study.c -o $*.o
+ $(O)/get.o: get.c
+-	$(CC) -c get.c -o $*.o
++	$(CC) $(CXXFLAGS) -c get.c -o $*.o
+ $(O)/maketables.o: maketables.c
+-	$(CC) -c maketables.c -o $*.o
++	$(CC) $(CXXFLAGS) -c maketables.c -o $*.o
+ $(O)/calc.o: calc.cpp
+-	$(CC) -c calc.cpp -o $*.o
++	$(CC) $(CXXFLAGS) -c calc.cpp -o $*.o
+ $(O)/adler32.o: adler32.c zlib.h zconf.h
+-	$(CC) -c adler32.c -o $*.o
++	$(CC) $(CXXFLAGS) -c adler32.c -o $*.o
+ $(O)/compress.o: compress.c zlib.h zconf.h
+-	$(CC) -c compress.c -o $*.o
++	$(CC) $(CXXFLAGS) -c compress.c -o $*.o
+ $(O)/crc32.o: crc32.c zlib.h zconf.h crc32.h
+-	$(CC) -c crc32.c -o $*.o
++	$(CC) $(CXXFLAGS) -c crc32.c -o $*.o
+ $(O)/deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
+-	$(CC) -c deflate.c -o $*.o
++	$(CC) $(CXXFLAGS) -c deflate.c -o $*.o
+ $(O)/gzio.o: gzio.c zutil.h zlib.h zconf.h
+-	$(CC) -c gzio.c -o $*.o
++	$(CC) $(CXXFLAGS) -c gzio.c -o $*.o
+ $(O)/infback.o: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+-	$(CC) -c infback.c -o $*.o
++	$(CC) $(CXXFLAGS) -c infback.c -o $*.o
+ $(O)/inffast.o: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+-	$(CC) -c inffast.c -o $*.o
++	$(CC) $(CXXFLAGS) -c inffast.c -o $*.o
+ $(O)/inflate.o: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+-	$(CC) -c inflate.c -o $*.o
++	$(CC) $(CXXFLAGS) -c inflate.c -o $*.o
+ $(O)/inftrees.o: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+-	$(CC) -c inftrees.c -o $*.o
++	$(CC) $(CXXFLAGS) -c inftrees.c -o $*.o
+ $(O)/trees.o: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+-	$(CC) -c trees.c -o $*.o
++	$(CC) $(CXXFLAGS) -c trees.c -o $*.o
+ $(O)/uncompr.o: uncompr.c zlib.h zconf.h
+-	$(CC) -c uncompr.c -o $*.o
++	$(CC) $(CXXFLAGS) -c uncompr.c -o $*.o
+ $(O)/zutil.o: zutil.c zutil.h zlib.h zconf.h
+-	$(CC) -c zutil.c -o $*.o
++	$(CC) $(CXXFLAGS) -c zutil.c -o $*.o
diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28.ebuild
new file mode 100644
index 000000000000..7d81c9ad114c
--- /dev/null
+++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/01/06 02:37:18 sbriesen Exp $
+
+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"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-makefile.diff"
+	epatch "${FILESDIR}/${P}-64bit.diff"
+	epatch "${FILESDIR}/${P}-main.diff"
+}
+
+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
+}