Version bump and remove old.

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

9 files changed, 69 insertions, 309 deletions

diff --git a/net-mail/libpst/ChangeLog b/net-mail/libpst/ChangeLog
index 2ffa568f382b..78b21c718b47 100644
--- a/net-mail/libpst/ChangeLog
+++ b/net-mail/libpst/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/libpst
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.23 2011/05/28 23:43:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.24 2011/08/05 05:07:48 radhermit Exp $
+
+*libpst-0.6.53 (05 Aug 2011)
+
+  05 Aug 2011; Tim Harder <radhermit@gentoo.org>
+  -files/libpst-0.4.1-gentoo.diff, -files/libpst-0.5.1-gentoo.diff,
+  -libpst-0.6.37.ebuild, -libpst-0.6.38.ebuild, -libpst-0.6.41.ebuild,
+  -files/libpst-0.6.41-asneeded.patch, +libpst-0.6.53.ebuild,
+  +files/libpst-0.6.53-pkgconfig-static.patch:
+  Version bump and remove old.
 
 *libpst-0.6.52 (28 May 2011)
 
diff --git a/net-mail/libpst/files/libpst-0.4.1-gentoo.diff b/net-mail/libpst/files/libpst-0.4.1-gentoo.diff
deleted file mode 100644
index c95866bdd882..000000000000
--- a/net-mail/libpst/files/libpst-0.4.1-gentoo.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN libpst_0.4.1.orig/Makefile libpst_0.4.1/Makefile
---- libpst_0.4.1.orig/Makefile	2004-12-14 23:22:39.649274808 -0500
-+++ libpst_0.4.1/Makefile	2004-12-14 23:24:22.831588712 -0500
-@@ -1,27 +1,41 @@
-+CC = gcc
-+INSTALL = install
-+MYFLAGS = -Wall
-+PREFIX = /usr
-+BINDIR = $(PREFIX)/bin
-+INCLUDEDIR = $(PREFIX)/include
-+LIBDIR = $(PREFIX)/lib
-+
- all: readpst getidblock
- 
- libpst.o: libpst.c libpst.h define.h
--	gcc -c -Wall -Werror libpst.c -g -o libpst.o
-+	$(CC) -c libpst.c $(MYFLAGS) $(CFLAGS) -o libpst.o
- 
- libstrfunc.o: libstrfunc.c libstrfunc.h
--	gcc -c -Wall -Werror libstrfunc.c -g -o libstrfunc.o
-+	$(CC) -c libstrfunc.c $(MYFLAGS) $(CFLAGS) -o libstrfunc.o
- 
- debug.o: debug.c
--	gcc -c debug.c -Wall -Werror -g -o debug.o
-+	$(CC) -c debug.c $(MYFLAGS) $(CFLAGS) -o debug.o
- 
- readpst: readpst.c define.h libpst.o timeconv.o libstrfunc.o common.h debug.o
- #	ccmalloc gcc -Wall -Werror readpst.c -g -o readpst libpst.o timeconv.o libstrfunc.o debug.o
- #	gcc -Wall -Werror readpst.c -g -o readpst libpst.o timeconv.o libstrfunc.o -lefence
--	gcc -Wall -Werror readpst.c -g -o readpst libpst.o timeconv.o libstrfunc.o debug.o
-+	$(CC) $(MYFLAGS) $(CFLAGS) readpst.c -o readpst libpst.o timeconv.o libstrfunc.o debug.o $(LDFLAGS)
- 
- timeconv.o: timeconv.c timeconv.h common.h
--	gcc -c -Wall -Werror timeconv.c -g -o timeconv.o
-+	$(CC) -c timeconv.c $(MYFLAGS) $(CFLAGS) -o timeconv.o
- 
- getidblock: getidblock.c define.h libpst.o common.h debug.o
--	gcc -Wall -Werror getidblock.c -g -o getidblock libpst.o debug.o timeconv.o
-+	$(CC) $(MYFLAGS) $(CFLAGS) getidblock.c -o getidblock libpst.o debug.o timeconv.o $(LDFLAGS)
- 
- clean: 
- 	rm -f core readpst libpst.o timeconv.o libstrfunc.o debug.o getidblock *~ 
- 
- rebuild: clean all
- 
-+install:
-+	$(INSTALL) -d $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(INCLUDEDIR) \
-+		$(DESTDIR)/$(LIBDIR)
-+	$(INSTALL) readpst getidblock $(DESTDIR)/$(BINDIR)
-+	$(INSTALL) -m0644 libpst.h $(DESTDIR)/$(INCLUDEDIR)
-+	$(INSTALL) -m0644 libpst.o $(DESTDIR)/$(LIBDIR)
-diff -urN libpst_0.4.1.orig/readpst.c libpst_0.4.1/readpst.c
---- libpst_0.4.1.orig/readpst.c	2004-12-14 23:22:39.655273896 -0500
-+++ libpst_0.4.1/readpst.c	2004-12-14 23:24:06.430082120 -0500
-@@ -718,6 +718,7 @@
-   //return that value
-   char *dir, *out_name, *index;
-   int x;
-+  dir = out_name = index = NULL;
-   if (kmail_chdir != NULL && chdir(kmail_chdir)) {
-     x = errno;
-     DIE(("mk_kmail_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
diff --git a/net-mail/libpst/files/libpst-0.5.1-gentoo.diff b/net-mail/libpst/files/libpst-0.5.1-gentoo.diff
deleted file mode 100644
index 7c0daff7eb62..000000000000
--- a/net-mail/libpst/files/libpst-0.5.1-gentoo.diff
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -urN libpst-0.5.1.orig/libpst.c libpst-0.5.1/libpst.c
---- libpst-0.5.1.orig/libpst.c	2004-12-15 23:23:52.000000000 -0500
-+++ libpst-0.5.1/libpst.c	2004-12-16 00:06:24.630215120 -0500
-@@ -261,7 +261,7 @@
- int32_t pst_attach_to_file(pst_file *pf, pst_item_attach *attach, FILE* fp) {
-   pst_index_ll *ptr;
-   struct holder h = {NULL, fp, 0, "", 0};
--  int32_t size;
-+  int32_t size = 0;
-   DEBUG_ENT("pst_attach_to_file");
-   if (attach->id_val != -1) {
-     ptr = _pst_getID(pf, attach->id_val);
-@@ -283,7 +283,7 @@
- int32_t pst_attach_to_file_base64(pst_file *pf, pst_item_attach *attach, FILE* fp) {
-   pst_index_ll *ptr;
-   struct holder h = {NULL, fp, 1, "", 0};
--  int32_t size;
-+  int32_t size = 0;
-   char *c;
-   DEBUG_ENT("pst_attach_to_file_base64");
-   if (attach->id_val != -1) {
-@@ -373,10 +373,10 @@
-   pst_desc_ll *p;
-   pst_num_array *na;
-   //  pst_index_ll *list;
--  pst_index2_ll *list2;//, *t;
-+  pst_index2_ll *list2 = NULL;//, *t;
-   unsigned char * buffer=NULL, *headerbuffer=NULL;//, *tc;
-   pst_x_attrib xattrib;
--  int32_t bptr = 0, bsize, hsize, tint, err=0, x;
-+  int32_t bptr = 0, bsize=0, hsize=0, tint, err=0, x;
-   pst_x_attrib_ll *ptr, *p_head=NULL, *p_sh=NULL, *p_sh2=NULL;
-   char *wt;
- 
-diff -urN libpst-0.5.1.orig/lspst.c libpst-0.5.1/lspst.c
---- libpst-0.5.1.orig/lspst.c	2004-12-15 23:23:52.000000000 -0500
-+++ libpst-0.5.1/lspst.c	2004-12-16 00:08:07.554568240 -0500
-@@ -37,7 +37,10 @@
- char *rfc2426_escape(char *str);
- char *rfc2445_datetime_format(FILETIME *ft);
- // }}}1
--#define DEBUG_MAIN(x) debug_print x;
-+#ifdef DEBUG_MAIN
-+# undef DEBUG_MAIN
-+# define DEBUG_MAIN(x) debug_print x;
-+#endif /* DEBUG_MAIN */
- // int main(int argc, char** argv) {{{1
- int main(int argc, char** argv) {
- 
-@@ -47,7 +50,7 @@
- 	pst_desc_ll *d_ptr;
- 	char *temp = NULL; //temporary char pointer
- 	int skip_child = 0;
--	struct file_ll  *f, *head;
-+	struct file_ll  *f = NULL, *head = NULL;
- 	// }}}2
- 
- 	if (argc <= 1)
-diff -urN libpst-0.5.1.orig/Makefile libpst-0.5.1/Makefile
---- libpst-0.5.1.orig/Makefile	2004-12-15 23:23:52.000000000 -0500
-+++ libpst-0.5.1/Makefile	2004-12-16 00:12:08.190985944 -0500
-@@ -1,7 +1,8 @@
- #!/usr/bin/make -f
- 
--CFLAGS  ?= -g -Wall
--PREFIX ?= /usr/local
-+CC ?= gcc
-+CFLAGS  += -Wall
-+PREFIX ?= /usr
- INSTALL ?= install
- 
- #---------------- Do not modify below this point ------------------
-@@ -58,8 +59,6 @@
- 	$(INSTALL_PROGRAM) readpst{,log} $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1
- 	$(INSTALL_FILE) readpst{,log}.1 $(DESTDIR)$(PREFIX)/share/man/man1/
--	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/doc/libpst
--	$(INSTALL_FILE) $(DOCS) $(DESTDIR)$(PREFIX)/share/doc/libpst/
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(PREFIX)/bin/readpst{,log}
-diff -urN libpst-0.5.1.orig/readpst.c libpst-0.5.1/readpst.c
---- libpst-0.5.1.orig/readpst.c	2004-12-15 23:23:52.000000000 -0500
-+++ libpst-0.5.1/readpst.c	2004-12-15 23:59:05.334998144 -0500
-@@ -144,7 +144,7 @@
-   int base64_body = 0;
-   //  int encrypt = 0;
-   FILE *fp;
--  char *enc; // base64 encoded attachment
-+  char *enc = NULL; // base64 encoded attachment
-   char *boundary = NULL, *b1, *b2; // the boundary marker between multipart sections
-   char *temp = NULL; //temporary char pointer
-   int attach_num = 0;
-diff -urN libpst-0.5.1.orig/readpstlog.c libpst-0.5.1/readpstlog.c
---- libpst-0.5.1.orig/readpstlog.c	2004-12-15 23:23:52.000000000 -0500
-+++ libpst-0.5.1/readpstlog.c	2004-12-16 00:04:38.368369376 -0500
-@@ -21,11 +21,11 @@
- 
- int main(int argc, char** argv) {
-   int *i=NULL, x, ptr, stop=0, flag;  
--  char *fname, *buf, format, rec_type;
-+  char *fname, *buf, format=0, rec_type;
-   unsigned char version;
-   int *show_type=NULL, show_size=0;
-   int *ex_type=NULL, ex_size=0;
--  unsigned int funcname, filename, text, end, dtype, line, c;
-+  unsigned int funcname=0, filename=0, text=0, end=0, dtype=0, line=0, c=0;
-   FILE *fp;
-   struct _debug_file_rec_m mfile_rec;
-   struct _debug_file_rec_l lfile_rec;
diff --git a/net-mail/libpst/files/libpst-0.6.41-asneeded.patch b/net-mail/libpst/files/libpst-0.6.41-asneeded.patch
deleted file mode 100644
index 9ba96ac4ab62..000000000000
--- a/net-mail/libpst/files/libpst-0.6.41-asneeded.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libpst-0.6.41.orig/configure.in	2009-06-24 05:29:31.000000000 +0200
-+++ libpst-0.6.41/configure.in	2009-10-30 22:36:07.421577082 +0100
-@@ -134,7 +134,7 @@
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h inttypes.h limits.h regex.h semaphore.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h sys/param.h sys/shm.h sys/stat.h sys/types.h time.h unistd.h wchar.h])
--AC_SEARCH_LIBS([sem_init],rt)
-+AC_SEARCH_LIBS([sem_init], [ pthread pthreads thread threads ] )
- 
- 
- # Checks for typedefs, structures, and compiler characteristics.
---- libpst-0.6.41.orig/Makefile.am	2009-06-24 05:29:31.000000000 +0200
-+++ libpst-0.6.41/Makefile.am	2009-10-30 22:43:06.738326493 +0100
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src python man html debian
- htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@
- html_DATA = AUTHORS COPYING ChangeLog NEWS README
diff --git a/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch b/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch
new file mode 100644
index 000000000000..373533b75935
--- /dev/null
+++ b/net-mail/libpst/files/libpst-0.6.53-pkgconfig-static.patch
@@ -0,0 +1,8 @@
+--- libpst-0.6.53/libpst.pc.in.orig
++++ libpst-0.6.53/libpst.pc.in
+@@ -8,4 +8,5 @@
+ Version: @VERSION@
+ Requires:
+ Libs: -L${libdir} -lpst
++Libs.private: @LIBS@
+ Cflags: -I${includedir}/libpst-@LIBPST_SO_MAJOR@
diff --git a/net-mail/libpst/libpst-0.6.37.ebuild b/net-mail/libpst/libpst-0.6.37.ebuild
deleted file mode 100644
index 96401e205491..000000000000
--- a/net-mail/libpst/libpst-0.6.37.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.37.ebuild,v 1.3 2009/06/15 03:54:38 jer Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/gd[png]
-	media-gfx/imagemagick[png]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable debug pst-debug) \
-		--enable-libpst-shared
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS TODO || die "dodoc failed"
-}
diff --git a/net-mail/libpst/libpst-0.6.38.ebuild b/net-mail/libpst/libpst-0.6.38.ebuild
deleted file mode 100644
index dc53358495b0..000000000000
--- a/net-mail/libpst/libpst-0.6.38.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.38.ebuild,v 1.2 2009/06/23 15:22:24 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE="debug"
-
-# newest version optionally pulls in boost for py bindings
-RDEPEND="media-libs/gd[png]
-	media-gfx/imagemagick[png]"
-	#>=dev-libs/boost-1.35.0-r5[python]"
-DEPEND="${RDEPEND}"
-
-# we disable the python bindings for now. Feel free to fix the configure script to know about py 2.6 and
-# such advanced concepts ...
-src_configure() {
-	econf \
-		$(use_enable debug pst-debug) \
-		--enable-libpst-shared \
-		--disable-python
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS TODO || die "dodoc failed"
-}
diff --git a/net-mail/libpst/libpst-0.6.41.ebuild b/net-mail/libpst/libpst-0.6.41.ebuild
deleted file mode 100644
index 7b59c8b72002..000000000000
--- a/net-mail/libpst/libpst-0.6.41.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.41.ebuild,v 1.5 2009/12/21 15:38:37 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://www.five-ten-sg.com/libpst/"
-SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug dii python"
-
-RDEPEND="dii? ( media-gfx/imagemagick[png] )"
-DEPEND="virtual/libiconv
-	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.35.0-r5[python] )
-	${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		--enable-libpst-shared
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS TODO || die "dodoc failed"
-}
diff --git a/net-mail/libpst/libpst-0.6.53.ebuild b/net-mail/libpst/libpst-0.6.53.ebuild
new file mode 100644
index 000000000000..f89aa8bfb413
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.53.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.53.ebuild,v 1.1 2011/08/05 05:07:48 radhermit Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.35.0-r5[python] )"
+
+src_prepare() {
+	# Don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# Fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${P}-pkgconfig-static.patch
+
+	# Conditionally install the extra documentation
+	use doc || sed -i -e "/SUBDIRS/s: html::" Makefile.am
+
+	eautomake
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	# Remove useless .la files
+	find "${ED}" -name '*.la' -exec rm {} +
+}