| 1 |
commit: 755ad7168ebe1cb8af983cb7a15837d201a7f456 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 22:31:29 2018 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 26 23:45:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=755ad716 |
| 7 |
|
| 8 |
app-misc/gnote: sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
| 12 |
|
| 13 |
app-misc/gnote/gnote-9999.ebuild | 27 ++++++++++----------------- |
| 14 |
1 file changed, 10 insertions(+), 17 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/gnote/gnote-9999.ebuild b/app-misc/gnote/gnote-9999.ebuild |
| 17 |
index ea84eb1f..a28d1674 100644 |
| 18 |
--- a/app-misc/gnote/gnote-9999.ebuild |
| 19 |
+++ b/app-misc/gnote/gnote-9999.ebuild |
| 20 |
@@ -1,12 +1,10 @@ |
| 21 |
-# Copyright 1999-2015 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
-# $Id$ |
| 25 |
|
| 26 |
-EAPI="5" |
| 27 |
-GCONF_DEBUG="no" |
| 28 |
+EAPI=6 |
| 29 |
GNOME2_LA_PUNT="yes" |
| 30 |
|
| 31 |
-inherit gnome2 readme.gentoo |
| 32 |
+inherit gnome2 readme.gentoo-r1 |
| 33 |
if [[ ${PV} = 9999 ]]; then |
| 34 |
inherit gnome2-live |
| 35 |
fi |
| 36 |
@@ -21,29 +19,27 @@ if [[ ${PV} = 9999 ]]; then |
| 37 |
else |
| 38 |
KEYWORDS="~amd64 ~x86" |
| 39 |
fi |
| 40 |
-IUSE="debug X" |
| 41 |
+IUSE="debug" |
| 42 |
|
| 43 |
# Automagic glib-2.32 dep |
| 44 |
COMMON_DEPEND=" |
| 45 |
>=app-crypt/libsecret-0.8 |
| 46 |
>=app-text/gtkspell-3.0:3 |
| 47 |
>=dev-cpp/glibmm-2.32:2 |
| 48 |
- >=dev-cpp/gtkmm-3.10:3.0 |
| 49 |
- >=dev-libs/boost-1.34 |
| 50 |
- >=dev-libs/glib-2.32:2 |
| 51 |
+ >=dev-cpp/gtkmm-3.18:3.0 |
| 52 |
+ >=dev-libs/glib-2.32:2[dbus] |
| 53 |
>=dev-libs/libxml2-2:2 |
| 54 |
dev-libs/libxslt |
| 55 |
>=sys-apps/util-linux-2.16:= |
| 56 |
- >=x11-libs/gtk+-3.10:3 |
| 57 |
- X? ( x11-libs/libX11 ) |
| 58 |
+ >=x11-libs/gtk+-3.20:3 |
| 59 |
" |
| 60 |
RDEPEND="${COMMON_DEPEND} |
| 61 |
gnome-base/gsettings-desktop-schemas |
| 62 |
" |
| 63 |
DEPEND="${DEPEND} |
| 64 |
app-text/docbook-xml-dtd:4.1.2 |
| 65 |
- dev-util/desktop-file-utils |
| 66 |
>=dev-util/intltool-0.35.0 |
| 67 |
+ dev-util/itstool |
| 68 |
virtual/pkgconfig |
| 69 |
" |
| 70 |
if [[ ${PV} = 9999 ]]; then |
| 71 |
@@ -54,6 +50,7 @@ fi |
| 72 |
src_prepare() { |
| 73 |
# Do not alter CFLAGS |
| 74 |
sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die |
| 75 |
+ |
| 76 |
gnome2_src_prepare |
| 77 |
|
| 78 |
if has_version net-fs/wdfs; then |
| 79 |
@@ -67,13 +64,9 @@ src_prepare() { |
| 80 |
} |
| 81 |
|
| 82 |
src_configure() { |
| 83 |
- local myconf="" |
| 84 |
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" |
| 85 |
gnome2_src_configure \ |
| 86 |
--disable-static \ |
| 87 |
- $(use_enable debug) \ |
| 88 |
- $(use_with X x11-support) \ |
| 89 |
- ${myconf} |
| 90 |
+ $(use_enable debug) |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
Archives