gnome-base/gnome-control-center: fix build with sys-libs/timezone-data-2015f

North Korea caused build failure.

Gentoo-Bug: 557628
Reported-by: Kamil Kamiński
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=753643

Package-Manager: portage-2.2.20.1

5 files changed, 321 insertions, 0 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 73fca6c151f3..6d1c3727fe94 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d WHIRLPOOL 15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
+DIST gnome-control-center-3.16.2-pyongyang.tar.xz 22808 SHA256 bc240beacc4f1e425d470ba21bdf19cd2cd547f232fa7d2a72299f75a7fb94d5 SHA512 04649782c34e72aa7169a62f2572d500533904ccd22782b660ec318996daa84d7d6c613c858080f94024d38778291cb1d03bd19497ab8a5724885730519c7c79 WHIRLPOOL 3518b9208da2763b084e0d294f00f8e8876f5d6bf38d3fa04af6766865a6e9d8ca8906a4da4d87344d238e6ea4e29c941a9f3a42b4c3e05cb58192839d134d9e
 DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
new file mode 100644
index 000000000000..28c1d75fbb0e
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16.2-pyongyang.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.13:3
+	>=gnome-base/gsettings-desktop-schemas-3.13.91
+	>=gnome-base/gnome-desktop-3.11.3:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+	>=x11-libs/libnotify-0.7.3:0=
+
+	>=gnome-extra/nm-applet-0.9.7.995
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=net-misc/modemmanager-0.7.990
+
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.9.90 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.33
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	# North Korea causes build failure, https://bugzilla.gnome.org/show_bug.cgi?id=753643
+	cp ../${PN}-3.16.2-pyongyang/*.png panels/datetime/data/ || die
+	epatch ../${PN}-3.16.2-pyongyang/*.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
index 726db5a68b8e..5265817fffb1 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
@@ -108,6 +108,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	gnome-base/gnome-common
+
+	<sys-libs/timezone-data-2015f
 "
 # Needed for autoreconf
 #	gnome-base/gnome-common
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
new file mode 100644
index 000000000000..ca24d61c8b2a
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16.2-pyongyang.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.15:3[X,wayland?]
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
+	>=gnome-base/gnome-desktop-3.11.3:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+	>=x11-libs/libnotify-0.7.3:0=
+
+	virtual/libgudev
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.15.1 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.7.995
+		>=net-misc/networkmanager-0.9.8[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.39
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-keep-panels-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	# North Korea causes build failure, https://bugzilla.gnome.org/show_bug.cgi?id=753643
+	cp ../${PN}-3.16.2-pyongyang/*.png panels/datetime/data/ || die
+	epatch ../${PN}-3.16.2-pyongyang/*.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_enable networkmanager) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
index 3a1e15987ff6..ba69373f2a58 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
@@ -115,6 +115,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	gnome-base/gnome-common
+
+	<sys-libs/timezone-data-2015f
 "
 # Needed for autoreconf
 #	gnome-base/gnome-common