Remove old

(Portage version: 2.1.10.39/cvs/Linux x86_64)

3 files changed, 5 insertions, 144 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 11dddf4e245e..c01edc986c5f 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.26 2011/11/28 23:45:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.27 2011/12/07 20:24:26 dilfridge Exp $
+
+  07 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -xournal-0.4.5-r2.ebuild, -files/xournal-0.4.5-xoprint-len.patch:
+  Remove old
 
   28 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   xournal-0.4.5_p20111022-r1.ebuild,
diff --git a/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch b/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch
deleted file mode 100644
index 56105af6cf4b..000000000000
--- a/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/src/xo-print.c
-+++ b/src/xo-print.c
-@@ -761,7 +761,7 @@ int pdf_draw_bitmap_background(struct Page *pg, GString *str,
- 
-   make_xref(xref, xref->last+1, pdfbuf->len);
-   g_string_append_printf(pdfbuf, 
--    "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject "
-+    "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject "
-     "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB "
-     "/BitsPerComponent 8 >> stream\n",
-     xref->last, zpix->len, width, height);
-@@ -840,8 +840,10 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-   gboolean fallback, is_binary;
-   guchar encoding[256];
-   gushort glyphs[256];
--  int i, j, num, len1, len2;
--  gsize len;
-+  int i, j, num;
-+  guint32 len1, len2;
-+  guint32 tt_len;
-+  gsize t1_len;
-   TrueTypeFont *ttfnt;
-   char *seg1, *seg2;
-   char *fontdata, *p;
-@@ -862,14 +864,14 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-       }
-     font->num_glyphs_used = num-1;
-     if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) {
--      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num, 
-+      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num, 
-                    0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) {
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n",
--          nobj_fontprog, (int)len, (int)len);
--        g_string_append_len(pdfbuf, fontdata, len);
-+          "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n",
-+          nobj_fontprog, tt_len, tt_len);
-+        g_string_append_len(pdfbuf, fontdata, tt_len);
-         g_string_append(pdfbuf, "endstream\nendobj\n");
-         g_free(fontdata);
-       }
-@@ -879,7 +881,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-     else fallback = TRUE;
-   } else {
-   // embed the font file: Type1 case
--    if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) {
-+    if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) {
-       if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) {
-         is_binary = TRUE;
-         len1 = pfb_get_length((unsigned char *)fontdata+2);
-@@ -898,7 +900,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-           if (*p=='\n' || *p=='\r') p++;
-           if (*p=='\n' || *p=='\r') p++;
-           len1 = p-fontdata;
--          p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END);
-+          p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END);
-           if (p==NULL) fallback = TRUE;
-           else {
-             // rewind 512 zeros
-@@ -936,7 +938,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n",
-+          "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n",
-           nobj_fontprog, len1+len2, len1, len2);
-         g_string_append_len(pdfbuf, seg1, len1);
-         g_string_append_len(pdfbuf, seg2, len2);
-@@ -1258,7 +1260,7 @@ gboolean print_to_pdf(char *filename)
-       tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1),
-                               pg->width, pg->height);
-       g_string_append_printf(pdfbuf,
--        "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n",
-+        "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n",
-         n_obj_prefix, tmpstr->len, tmpstr->str);
-       g_string_free(tmpstr, TRUE);
-       g_string_prepend(pgstrm, "Q Q Q ");
-@@ -1276,7 +1278,7 @@ gboolean print_to_pdf(char *filename)
-     
-     make_xref(&xref, xref.last+1, pdfbuf->len);
-     g_string_append_printf(pdfbuf, 
--      "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n",
-+      "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n",
-       xref.last, zpgstrm->len);
-     g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len);
-     g_string_free(zpgstrm, TRUE);
diff --git a/app-text/xournal/xournal-0.4.5-r2.ebuild b/app-text/xournal/xournal-0.4.5-r2.ebuild
deleted file mode 100644
index 549821768ea8..000000000000
--- a/app-text/xournal/xournal-0.4.5-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5-r2.ebuild,v 1.4 2011/09/20 14:43:13 nativemad Exp $
-
-EAPI=4
-inherit gnome2 eutils
-
-DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+pdf doc"
-
-COMMONDEPEND="
-	app-text/poppler[cairo]
-	dev-libs/atk
-	dev-libs/glib
-	gnome-base/libgnomecanvas
-	media-libs/freetype
-	media-libs/fontconfig
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-xoprint-len.patch #bug 287701
-	epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz   # the image patch
-}
-
-#src_configure() {
-#	default
-#}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" desktop-install
-
-	dodoc ChangeLog AUTHORS README
-	if use doc ; then
-		dohtml -r html-doc/*
-	fi
-}