commit: 8ecb0d8858564de2bfc7d89a8d78c415ce05ea76
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 18:36:41 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 18:36:41 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8ecb0d88
gnome-base/gnome-settings-daemon: Bump version to 3.18.0
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
...emon-9999.ebuild => gnome-settings-daemon-3.18.0.ebuild} | 13 +++----------
.../gnome-settings-daemon/gnome-settings-daemon-9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
similarity index 93%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
index f50486d..934e8d7 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
@@ -8,9 +8,6 @@ GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Gnome Settings Daemon"
HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon";
@@ -23,11 +20,7 @@ REQUIRED_USE="
smartcard? ( udev )
test? ( ${PYTHON_REQUIRED_USE} )
"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=dev-libs/glib-2.37.7:2[dbus]
@@ -111,7 +104,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
epatch_user
- [[ ${PV} != 9999 ]] && eautoreconf
+ eautoreconf
gnome2_src_prepare
}
@@ -146,7 +139,7 @@ pkg_postinst() {
if ! systemd_is_booted; then
ewarn "${PN} needs Systemd to be *running* for working"
ewarn "properly. Please follow the this guide to migrate:"
- ewarn "http://wiki.gentoo.org/wiki/Systemd";
+ ewarn "https://wiki.gentoo.org/wiki/Systemd";
fi
if use openrc-force; then
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index f50486d..1c29112 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -146,7 +146,7 @@ pkg_postinst() {
if ! systemd_is_booted; then
ewarn "${PN} needs Systemd to be *running* for working"
ewarn "properly. Please follow the this guide to migrate:"
- ewarn "http://wiki.gentoo.org/wiki/Systemd";
+ ewarn "https://wiki.gentoo.org/wiki/Systemd";
fi
if use openrc-force; then
