[gentoo-commits] gentoo-x86 commit in app-text/xournal: ChangeLog xournal-0.4.7.ebuild xournal-9999.ebuild xournal-0.4.6-r3.ebuild xournal-0.4.6.ebuild

[Andreas HAttel (dilfridge)]

dilfridge    12/07/05 22:53:15

  Modified:             ChangeLog xournal-9999.ebuild
  Added:                xournal-0.4.7.ebuild
  Removed:              xournal-0.4.6-r3.ebuild xournal-0.4.6.ebuild
  Log:
  Version bump, fix patch logic; remove old
  
  (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

Revision  Changes    Path
1.40                 app-text/xournal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?r1=1.39&r2=1.40

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog	1 Jul 2012 18:35:53 -0000	1.39
+++ ChangeLog	5 Jul 2012 22:53:15 -0000	1.40
@@ -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@g.o> -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@g.o>
   xournal-0.4.6-r3.ebuild:



1.2                  app-text/xournal/xournal-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-9999.ebuild?r1=1.1&r2=1.2

Index: xournal-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xournal-9999.ebuild	1 Jul 2012 18:20:54 -0000	1.1
+++ xournal-9999.ebuild	5 Jul 2012 22:53:15 -0000	1.2
@@ -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 @@
 "
 
 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
 }
 



1.1                  app-text/xournal/xournal-0.4.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.7.ebuild?rev=1.1&content-type=text/plain

Index: xournal-0.4.7.ebuild
===================================================================
# 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.7.ebuild,v 1.1 2012/07/05 22:53:15 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/"

LICENSE="GPL-2"

SLOT="0"
IUSE="+pdf vanilla"

if [[ "${PV}" != "9999" ]]; then
	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz !vanilla? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz )"
	KEYWORDS="~amd64 ~x86"
else
	inherit git-2
	SRC_URI=""
	KEYWORDS=""
	if use vanilla; then
		EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal"
	else
		EGIT_REPO_URI="git://gitorious.org/gentoo-stuff/xournal-gentoo.git"
		EGIT_BRANCH="gentoo"
	fi
fi

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() {
	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
}

src_install() {
	emake DESTDIR="${D}" install
	emake DESTDIR="${D}" desktop-install

	dodoc ChangeLog AUTHORS README
	dohtml -r html-doc/*
}