| 1 |
commit: 8165348a970678b204980b701381f2cc367de0ed |
| 2 |
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 13:27:44 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 13:27:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8165348a |
| 7 |
|
| 8 |
app-text/xournal: Version and EAPI bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
app-text/xournal/Manifest | 1 + |
| 13 |
.../{xournal-9999.ebuild => xournal-0.4.8.2016.ebuild} | 15 ++++++++++----- |
| 14 |
app-text/xournal/xournal-9999.ebuild | 15 ++++++++++----- |
| 15 |
3 files changed, 21 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest |
| 18 |
index 2ba2d9e35e9..7614a521a7a 100644 |
| 19 |
--- a/app-text/xournal/Manifest |
| 20 |
+++ b/app-text/xournal/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
+DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e |
| 23 |
DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf |
| 24 |
|
| 25 |
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild |
| 26 |
similarity index 85% |
| 27 |
copy from app-text/xournal/xournal-9999.ebuild |
| 28 |
copy to app-text/xournal/xournal-0.4.8.2016.ebuild |
| 29 |
index 422842c0e82..50477f8a453 100644 |
| 30 |
--- a/app-text/xournal/xournal-9999.ebuild |
| 31 |
+++ b/app-text/xournal/xournal-0.4.8.2016.ebuild |
| 32 |
@@ -1,9 +1,7 @@ |
| 33 |
# Copyright 1999-2018 Gentoo Foundation |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
-EAPI=5 |
| 37 |
- |
| 38 |
-GCONF_DEBUG=no |
| 39 |
+EAPI=6 |
| 40 |
|
| 41 |
[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes |
| 42 |
|
| 43 |
@@ -23,7 +21,7 @@ HOMEPAGE="http://xournal.sourceforge.net/" |
| 44 |
|
| 45 |
LICENSE="GPL-2" |
| 46 |
SLOT="0" |
| 47 |
-IUSE="+pdf" |
| 48 |
+IUSE="+pdf vanilla" |
| 49 |
|
| 50 |
COMMONDEPEND=" |
| 51 |
app-text/poppler[cairo] |
| 52 |
@@ -45,10 +43,17 @@ DEPEND="${COMMONDEPEND} |
| 53 |
virtual/pkgconfig |
| 54 |
" |
| 55 |
|
| 56 |
+src_prepare() { |
| 57 |
+ default_src_prepare |
| 58 |
+ if ! use vanilla; then |
| 59 |
+ eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch |
| 60 |
+ fi |
| 61 |
+} |
| 62 |
+ |
| 63 |
src_install() { |
| 64 |
emake DESTDIR="${D}" install |
| 65 |
emake DESTDIR="${D}" desktop-install |
| 66 |
|
| 67 |
dodoc ChangeLog AUTHORS README |
| 68 |
- dohtml -r html-doc/* |
| 69 |
+ dodoc -r html-doc/* |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild |
| 73 |
index 422842c0e82..50477f8a453 100644 |
| 74 |
--- a/app-text/xournal/xournal-9999.ebuild |
| 75 |
+++ b/app-text/xournal/xournal-9999.ebuild |
| 76 |
@@ -1,9 +1,7 @@ |
| 77 |
# Copyright 1999-2018 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
-EAPI=5 |
| 81 |
- |
| 82 |
-GCONF_DEBUG=no |
| 83 |
+EAPI=6 |
| 84 |
|
| 85 |
[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes |
| 86 |
|
| 87 |
@@ -23,7 +21,7 @@ HOMEPAGE="http://xournal.sourceforge.net/" |
| 88 |
|
| 89 |
LICENSE="GPL-2" |
| 90 |
SLOT="0" |
| 91 |
-IUSE="+pdf" |
| 92 |
+IUSE="+pdf vanilla" |
| 93 |
|
| 94 |
COMMONDEPEND=" |
| 95 |
app-text/poppler[cairo] |
| 96 |
@@ -45,10 +43,17 @@ DEPEND="${COMMONDEPEND} |
| 97 |
virtual/pkgconfig |
| 98 |
" |
| 99 |
|
| 100 |
+src_prepare() { |
| 101 |
+ default_src_prepare |
| 102 |
+ if ! use vanilla; then |
| 103 |
+ eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch |
| 104 |
+ fi |
| 105 |
+} |
| 106 |
+ |
| 107 |
src_install() { |
| 108 |
emake DESTDIR="${D}" install |
| 109 |
emake DESTDIR="${D}" desktop-install |
| 110 |
|
| 111 |
dodoc ChangeLog AUTHORS README |
| 112 |
- dohtml -r html-doc/* |
| 113 |
+ dodoc -r html-doc/* |
| 114 |
} |
Archives