Version bump and remove old.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

10 files changed, 81 insertions, 327 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/Manifest b/net-mail/libpst/Manifest
index ce3a7644fabf..36ad640bb35e 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,31 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX libpst-0.4.1-gentoo.diff 2459 RMD160 c019a14cb9c8917ca5c8731dd7fc7b7ca7f66213 SHA1 86334f08eaf74ddcf1590f54ff0a2bd7a3825e4f SHA256 208e4c71ceb7b16ddce8ac253affb2ead0c0cd2564417ccf81cbce3cc43aeb2e
-AUX libpst-0.5.1-gentoo.diff 3961 RMD160 6b02a093dfb00651e4b5845bef8f287826604114 SHA1 1c06143ebd7dcfc2c23efeb41ae554d9232b0fab SHA256 321145c02e92b178ab20bf113d2c499058cb98247026728d23d6b90a330e4a4a
 AUX libpst-0.5.2-gentoo.diff 3961 RMD160 6b02a093dfb00651e4b5845bef8f287826604114 SHA1 1c06143ebd7dcfc2c23efeb41ae554d9232b0fab SHA256 321145c02e92b178ab20bf113d2c499058cb98247026728d23d6b90a330e4a4a
-AUX libpst-0.6.41-asneeded.patch 889 RMD160 7064ea0a6e7b7283ce5b58172008b9307487d0f0 SHA1 4c41185d7a3af0a9041b1c788e6fdac16a931dc9 SHA256 99cd8e91654607ffa241388f4cafc8c7b241de71f1298f37ee63c97eaea59ae1
 AUX libpst-0.6.52-no-static-python-lib.patch 449 RMD160 3cac625d3d43729aaedacf85047d8991a97c1423 SHA1 19d259eef564cb7b624eb370906581d9a48e47f9 SHA256 38d477f58bbc4f518cc79dbe322c475bfb3829cc5daa93cb6ccf79da92e36656
+AUX libpst-0.6.53-pkgconfig-static.patch 211 RMD160 9d5434781efd9903e6a0632031bf730bb7a6d51e SHA1 83ecce2f0dbb33cea6770b938f2e868135513143 SHA256 abf4dbfd38287db637a5ad22a498c5decd00f44ad9a0f734f65220a4c94c22fb
 DIST libpst-0.5.2.tar.gz 89256 RMD160 fc4e0976841f7a4da21f0c2d77e126d27e00a641 SHA1 d5b13f293512a845da00ceb9bb1a78ec03b79874 SHA256 1e4a0e7a8d1572e8fe77c62a0e747b832bb93814fd1df624077ad0f879477857
-DIST libpst-0.6.37.tar.gz 2209013 RMD160 2dc16940d39e151092d448d21117759c4e6bf805 SHA1 dc55714d74e2e76e039c473a2f78c6ea87fe0020 SHA256 349826f3d68d01ca60dca386af8e493e8a5e94c6a23efcec03fdfb294e8a2f57
-DIST libpst-0.6.38.tar.gz 1990743 RMD160 816763db3ebe9484b30f5f180d140a7c940256ab SHA1 19ec83569fca12c3ecfc334b46fa080af641c12f SHA256 32137513288c8f0302cc0f49df55997335aaa10c540f2a2e255977fcb281f431
-DIST libpst-0.6.41.tar.gz 1933360 RMD160 01cdef53e07e7f776e876c55030c8394aae51b2b SHA1 bf03b21df25675ee148af68dbd48e665d6d8dfc0 SHA256 3501b885ebaa9bbd1c7d62ddb4972844a1f6cefe215c3ff3e44c37b1a168d970
 DIST libpst-0.6.52.tar.gz 2017729 RMD160 826673706abd4079ce55f5f3f1ca792a3a6ddbd1 SHA1 7f8d8cd072aa518efbb9b3e25ec4da81557b74b6 SHA256 8c0d9555a7293ac0c24ba09112d55493ce7f4fac91dd24fa1a5faaa913d5b46d
+DIST libpst-0.6.53.tar.gz 2012991 RMD160 fd8be7a9288f82101ef60cd509d39ea45c4aee7d SHA1 b8e5972429091fd0e915fd3eb695b68adbe1f7cc SHA256 55a5f0c34a678ee79dc286b4c436afb734b30d66573c81dc49092f03d55f80e5
 EBUILD libpst-0.5.2.ebuild 884 RMD160 b8368c34d89a5ae69bee8e434d63b4c8a47fde1c SHA1 c30988a6e1e32b466e3a9bd05e81bdafcfaed109 SHA256 40d8dcea6b9455256f7dbd396d47a84303996d8c7eea227b68a935c391a10d7a
-EBUILD libpst-0.6.37.ebuild 880 RMD160 077dea3dc492332ce8e7c7218f81a97908e305ba SHA1 a2b398f0e815ff0b97274de1e2958c6d6a2ec8f0 SHA256 3001f42cb885643bf82dda1d00a91d0459db2809ed73f524e78df7ededc75a24
-EBUILD libpst-0.6.38.ebuild 1138 RMD160 59833f9e908fc6922bc16115b55f70c72bb4552a SHA1 f609838ceee4ae2554462894656fd726a6f8fabc SHA256 abe949612ba7f531e45df8d394eb1e9be5037a0e4b26671dac6c033dc78ca30d
-EBUILD libpst-0.6.41.ebuild 1134 RMD160 4b186de31b23cc3a8a801e528262f1dfa802ccc9 SHA1 2258352db0617dad216d7c70ca8eabe253879768 SHA256 bc538d193628d480babc0e0ae9c6042d90d09893bd3f3d86f15860102b9a31c3
 EBUILD libpst-0.6.52.ebuild 1317 RMD160 8b12d36cac274dd97c6b0a43bdc4add102bfd323 SHA1 1202e8dbe7e0ffc20dff82877d2a01c78073ca2b SHA256 3b3df62cfa1647628010aa879628400b79824569067e5256b95f93cf178aca0d
-MISC ChangeLog 3657 RMD160 d6e7ce500eb2be74b0dc334c74c7f68ae6bc1daa SHA1 a0fb6854edb66face10b0d2979f34dc0e8b9c879 SHA256 b987a2cd21fd1e0a4e1c45bd91d58023a96d182d37b12b2f7a46ad0846147f78
+EBUILD libpst-0.6.53.ebuild 1329 RMD160 645fdb7e6c25e1c16ef0fcd6a5e56f4ceed8761c SHA1 1ba3a60e62c7270f54d6404f7fa1accb9444bb72 SHA256 a8a668b5b685dceeba053b92d7f1d913e6c9a39770fb165139eda64f24dc432e
+MISC ChangeLog 4016 RMD160 19c72e5673627753d5a94db7aa49568c8e013733 SHA1 4c86b078665792e012a0879548ea5686908a6830 SHA256 f4e67a3ed187fb6aa85e82e5949b8fce7e0c61928f5bb1d0d7f690939d45fd10
 MISC metadata.xml 227 RMD160 19b1e52cedc98f0d357f05198fb9d53dc149a7cf SHA1 7f535de4050c8a8f8e8c45a7bf1767c995a57e1c SHA256 8627e4b3c97288567f379156f258e1e2e76f1570bb6abb583a80631b83b21873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN4YioAAoJEEqz6FtPBkyjaoUH/0E0FZ3PGXtG78iRKOikV9sZ
-3xTKwt5PLRxscziZUrz11Mew2ILkgYasifknZ+Kw6oT9863LmIl2c3mkKmWefL6u
-QubifMVCEgmTte75rv0SrK1ZxP1QZSmz92ylGRm2rqaeMk2I2pYQQDjlQdz3pWQg
-UX8//AaJ8JHM7xfjqR/rI4eQXA0MsbeQ8QuZWkA5A2ueNFGbH4wbzNdL9RCpaoki
-EVIVxRyzcKNtina4e5r/4dUcyy3TdfDUuabSzJXSpAlvI1DVwVU96lmiAsAYQ1i/
-Vpedy3LTWyUeLjD3oOShwJMVTRQo577FMgN+teGOlDnsXefblLTdZCGTafS/uhg=
-=PYCM
+iQEcBAEBCgAGBQJOO3qxAAoJEEqz6FtPBkyja8wH/jvfn6IoGidzn64UuI3/JYvS
+2qlg4A9RYcLoguAc7C2Cj0GjQDzPpkJzdsGDUmjErOsacYTFm7cwLdjmO94xjsOd
+D60k7X6vdZ1amb3Gq62iKcBZ4I3yNOyF2Pnsx5ClqUmJG1VC7mEBIj3c67FhM0Zp
+R4E5VA5OXB9saTaoWGb0094CRJBwwWFXb0apa1xOLR/4xW6JJIEpYhQLPTWIzd8q
+Tk0hMdc+PqIU8ynH7uX1elSxDuUiQAoBEgFO6/iDQnSryyRVTmTliJwcqxxP/5v0
+brRqy9anqZZRS+rqw/rq7SOG5L19+CQD4VtIgtVdW7x7oAeGdhrIqdQ0viFS2Ok=
+=n1cK
 -----END PGP SIGNATURE-----
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 {} +
+}