Remove old.

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

3 files changed, 5 insertions, 146 deletions

diff --git a/net-mail/libpst/ChangeLog b/net-mail/libpst/ChangeLog
index 568c9efb6b28..42a8c98206c0 100644
--- a/net-mail/libpst/ChangeLog
+++ b/net-mail/libpst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/libpst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.34 2012/08/27 09:31:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.35 2012/08/28 07:12:13 radhermit Exp $
+
+  28 Aug 2012; Tim Harder <radhermit@gentoo.org> -libpst-0.5.2.ebuild,
+  -files/libpst-0.5.2-gentoo.diff:
+  Remove old.
 
 *libpst-0.6.55 (27 Aug 2012)
 
diff --git a/net-mail/libpst/files/libpst-0.5.2-gentoo.diff b/net-mail/libpst/files/libpst-0.5.2-gentoo.diff
deleted file mode 100644
index 7c0daff7eb62..000000000000
--- a/net-mail/libpst/files/libpst-0.5.2-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/libpst-0.5.2.ebuild b/net-mail/libpst/libpst-0.5.2.ebuild
deleted file mode 100644
index 0266cec62e59..000000000000
--- a/net-mail/libpst/libpst-0.5.2.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.5.2.ebuild,v 1.2 2009/04/02 12:13:33 caleb Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="http://alioth.debian.org/projects/libpst/"
-SRC_URI="http://alioth.debian.org/download.php/844/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-0.5.1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS CREDITS TODO FILE-FORMAT || die "dodoc failed"
-	dohtml FILE-FORMAT.html || die "dohtml failed"
-}