Cleanup

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

4 files changed, 7 insertions, 119 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index c4a3158633f3..bb0829fcb48b 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.42 2013/02/14 20:19:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.43 2013/03/17 00:30:29 dilfridge Exp $
+
+  17 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -xournal-0.4.5_p20111022-r2.ebuild,
+  -files/xournal-0.4.5_p20111022-underlinking-2.patch,
+  -xournal-0.4.6-r1.ebuild:
+  Cleanup
 
   14 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xournal-0.4.7.ebuild:
   Stable for x86, wrt bug #457522
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch
deleted file mode 100644
index 5a51288a4b83..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ruN xournal-0.4.5_p20111022.orig/src/Makefile.am xournal-0.4.5_p20111022/src/Makefile.am
---- xournal-0.4.5_p20111022.orig/src/Makefile.am	2012-06-24 12:57:21.453958621 +0200
-+++ xournal-0.4.5_p20111022/src/Makefile.am	2012-06-24 12:58:07.696957705 +0200
-@@ -30,5 +30,5 @@
-   xournal_LDFLAGS = -mwindows
-   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
- else
--  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
-+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
- endif
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
deleted file mode 100644
index 426887ce8019..000000000000
--- a/app-text/xournal/xournal-0.4.5_p20111022-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 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_p20111022-r2.ebuild,v 1.5 2012/06/24 11:03:29 dilfridge Exp $
-
-EAPI=4
-
-GCONF_DEBUG=no
-
-inherit gnome2 autotools
-
-DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-patchset.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+pdf"
-
-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}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${WORKDIR}"/0*.patch
-	epatch "${FILESDIR}/${P}-underlinking-2.patch"
-	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
-	rm -f "${S}/aclocal.m4"  # bug 423285
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" desktop-install
-
-	dodoc ChangeLog AUTHORS README
-	dohtml -r html-doc/*
-}
diff --git a/app-text/xournal/xournal-0.4.6-r1.ebuild b/app-text/xournal/xournal-0.4.6-r1.ebuild
deleted file mode 100644
index a5371db6d072..000000000000
--- a/app-text/xournal/xournal-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r1.ebuild,v 1.1 2012/06/24 11:08:44 dilfridge Exp $
-
-EAPI=4
-
-GCONF_DEBUG=no
-
-inherit gnome2 autotools
-
-DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf"
-
-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}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
-	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" desktop-install
-
-	dodoc ChangeLog AUTHORS README
-	dohtml -r html-doc/*
-}