1 |
dilfridge 12/07/01 18:35:53 |
2 |
|
3 |
Modified: ChangeLog xournal-0.4.6-r3.ebuild |
4 |
Log: |
5 |
Sync with live ebuild and thereby add keywords |
6 |
|
7 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.39 app-text/xournal/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.39&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?rev=1.39&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/ChangeLog?r1=1.38&r2=1.39 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v |
19 |
retrieving revision 1.38 |
20 |
retrieving revision 1.39 |
21 |
diff -u -r1.38 -r1.39 |
22 |
--- ChangeLog 1 Jul 2012 18:20:54 -0000 1.38 |
23 |
+++ ChangeLog 1 Jul 2012 18:35:53 -0000 1.39 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for app-text/xournal |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.38 2012/07/01 18:20:54 dilfridge Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.39 2012/07/01 18:35:53 dilfridge Exp $ |
29 |
+ |
30 |
+ 01 Jul 2012; Andreas K. Huettel <dilfridge@g.o> |
31 |
+ xournal-0.4.6-r3.ebuild: |
32 |
+ Sync with live ebuild and thereby add keywords |
33 |
|
34 |
*xournal-9999 (01 Jul 2012) |
35 |
*xournal-0.4.6-r3 (01 Jul 2012) |
36 |
|
37 |
|
38 |
|
39 |
1.2 app-text/xournal/xournal-0.4.6-r3.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: xournal-0.4.6-r3.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- xournal-0.4.6-r3.ebuild 1 Jul 2012 18:20:54 -0000 1.1 |
52 |
+++ xournal-0.4.6-r3.ebuild 1 Jul 2012 18:35:53 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2012 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r3.ebuild,v 1.1 2012/07/01 18:20:54 dilfridge Exp $ |
57 |
+# $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 $ |
58 |
|
59 |
EAPI=4 |
60 |
|
61 |
@@ -11,12 +11,25 @@ |
62 |
DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus." |
63 |
HOMEPAGE="http://xournal.sourceforge.net/" |
64 |
|
65 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz" |
66 |
LICENSE="GPL-2" |
67 |
|
68 |
SLOT="0" |
69 |
-KEYWORDS="" |
70 |
-IUSE="+pdf" |
71 |
+IUSE="+pdf vanilla" |
72 |
+ |
73 |
+if [[ "${PV}" != "9999" ]]; then |
74 |
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz !vanilla? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz )" |
75 |
+ KEYWORDS="~amd64 ~x86" |
76 |
+else |
77 |
+ inherit git-2 |
78 |
+ SRC_URI="" |
79 |
+ KEYWORDS="" |
80 |
+ if use vanilla; then |
81 |
+ EGIT_REPO_URI="git://xournal.git.sourceforge.net/gitroot/xournal/xournal" |
82 |
+ else |
83 |
+ EGIT_REPO_URI="git://gitorious.org/gentoo-stuff/xournal-gentoo.git" |
84 |
+ EGIT_BRANCH="gentoo" |
85 |
+ fi |
86 |
+fi |
87 |
|
88 |
COMMONDEPEND=" |
89 |
app-text/poppler[cairo] |
90 |
@@ -39,7 +52,7 @@ |
91 |
" |
92 |
|
93 |
src_prepare() { |
94 |
- epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch |
95 |
+ [[ "${PV}" != "9999" ]] && epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch |
96 |
sed -e "s:n http:n Gentoo release ${PVR}\\\\n http:" -i "${S}"/src/xo-interface.c |
97 |
eautoreconf |
98 |
} |