Version bump, fix patch logic; remove old

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

4 files changed, 21 insertions, 60 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 88b36365a0b5..91f976a1b2bb 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.39 2012/07/01 18:35:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.40 2012/07/05 22:53:15 dilfridge Exp $
+
+*xournal-0.4.7 (05 Jul 2012)
+
+  05 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> -xournal-0.4.6.ebuild,
+  -xournal-0.4.6-r3.ebuild, +xournal-0.4.7.ebuild, xournal-9999.ebuild:
+  Version bump, fix patch logic; remove old
 
   01 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   xournal-0.4.6-r3.ebuild:
diff --git a/app-text/xournal/xournal-0.4.6.ebuild b/app-text/xournal/xournal-0.4.6.ebuild
deleted file mode 100644
index 1e8dfee73506..000000000000
--- a/app-text/xournal/xournal-0.4.6.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.ebuild,v 1.1 2012/06/01 20:13:20 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/${P}-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}"/${P}-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/*
-}
diff --git a/app-text/xournal/xournal-0.4.6-r3.ebuild b/app-text/xournal/xournal-0.4.7.ebuild
index da87c33654ea..5eb47de3786d 100644
--- a/app-text/xournal/xournal-0.4.6-r3.ebuild
+++ b/app-text/xournal/xournal-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.2 2012/07/01 18:35:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild,v 1.1 2012/07/05 22:53:15 dilfridge Exp $
 
 EAPI=4
 
@@ -52,8 +52,12 @@ DEPEND="${COMMONDEPEND}
 "
 
 src_prepare() {
-	[[ "${PV}" != "9999" ]] && epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
-	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	if ! use vanilla && [[ "${PV}" != "9999" ]]; then
+		epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
+	fi
+	if ! use vanilla; then 
+		sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	fi
 	eautoreconf
 }
 
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index b528a09efde2..95d098aa0399 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.1 2012/07/01 18:20:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v 1.2 2012/07/05 22:53:15 dilfridge Exp $
 
 EAPI=4
 
@@ -52,8 +52,12 @@ DEPEND="${COMMONDEPEND}
 "
 
 src_prepare() {
-	[[ "${PV}" != "9999" ]] && epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
-	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	if ! use vanilla && [[ "${PV}" != "9999" ]]; then
+		epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
+	fi
+	if ! use vanilla; then 
+		sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
+	fi
 	eautoreconf
 }