updates

merged: funtoo-media: 704d0594ec6751626eb406fe8ec054335c07b648 funtoo-overlay: a621db5e6f6339c06ab4fca2bf91f6f4fd41cf0c
fr34k8 · Mar 19, 2015 · 1566e49 · 1566e49
1 parent 44de9f0
commit 1566e49
Show file tree

Hide file tree

Showing 35 changed files with 154 additions and 518 deletions.
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
@@ -1,3 +1,2 @@
-DIST json-glib-0.16.2.tar.xz 506640 SHA256 a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c SHA512 6e1d9f0c1dcf02f93f22089d4669948e3b3c8217ac0b78b626d5877445e705bc28aa4b47d410fa0e35ba0a1a14df594ac069f1f86fbd0e384a942f74e60b6a12 WHIRLPOOL c58c2269f7746f1491d5a9d0996aabd739c7ac73521c0bd8f37dd82bdd537eab26334e113bbfd0be17eb88950e11c2424018b62e9a815c95382c2cb664f75f43
-DIST json-glib-1.0.0.tar.xz 547100 SHA256 dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde SHA512 9c798f473804c672447599a66db88ad5ee9e46cc55cd2051e386fe960731dc4e3d46cfcc607ff7bbf60786ae00ca88aaf4e83795133bf54988f7fe5715479b37 WHIRLPOOL 7863a63d9ceec9ebd3f337d0dc61ce24d7609930808e2a89f5dbf762721a15d351800f36e7e5e5f7ae2cc4d5d535353a4aa0bcd7e82e15868cbcd7155cedce1f
 DIST json-glib-1.0.2.tar.xz 550340 SHA256 887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a SHA512 c2934298d146749514706bcafda21e47a815480e2a85ae34560a6e4fd9063be2761786b8f8532965b417ccb18f96d2487ca5118c70d6112b3bbcdfe193bfcefd WHIRLPOOL 67ec22e65b847e7395c3f0a10000191b4d9ea296f24c334b0d1d0f06da4859be7c752a046757c64ec0c07c4c6e314108dc4a5a79f048370bf0682b3bd64af7d1
+DIST json-glib-1.0.4.tar.xz 557236 SHA256 80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd SHA512 491a2353b7a82015516b5029d400874f35ba9d8ad914eb3f97e6106eaf2daa300147725ffbaaf5a67a6bf0da192beb47cd4edee47ecdb6a4be7dfd5f51463e5b WHIRLPOOL 337bdbd8108c5f94d212c0cb249f514aef10d5cc373ad24687cd52d115fd6c148d50aecfe664423c21f486b8ce2e88d4b8dffd18ac7d3a15332177c5aac88c25
diff --git a/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch b/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
diff --git a/dev-libs/json-glib/json-glib-0.16.2.ebuild b/dev-libs/json-glib/json-glib-0.16.2.ebuild
diff --git a/dev-libs/json-glib/json-glib-1.0.0.ebuild → dev-libs/json-glib/json-glib-1.0.4.ebuild b/dev-libs/json-glib/json-glib-1.0.0.ebuild → dev-libs/json-glib/json-glib-1.0.4.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.0.ebuild,v 1.1 2014/04/27 16:22:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.4.ebuild,v 1.1 2015/03/19 11:47:39 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/JsonGlib"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug +introspection"
 
 RDEPEND="
-	>=dev-libs/glib-2.37.6:2
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 "
 DEPEND="${RDEPEND}
@@ -25,19 +25,33 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
 src_prepare() {
 	# Do not touch CFLAGS
 	sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die
+	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	# Coverage support is useless, and causes runtime problems
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--enable-man \
 		--disable-gcov \
 		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable introspection)
+		$(multilib_native_use_enable introspection)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/reference/html doc/reference/html || die
+	fi
+}
+
+multilib_src_compile() {
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
 }
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47
 DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
+DIST gnome-control-center-3.14.3.tar.xz 6984324 SHA256 21f49787cf708e591f53b6d2a6e1c059037a62726f23b9513b0d116996066e15 SHA512 2c0af090b00e4352ad7bae7937ed3eeecc88cee963a037961446fe492da1c6637a71700eba40a5ab5bc5233df774b621f5e1757214431919c48b2afb01ff8f9d WHIRLPOOL 9bf8499c907088b6dfa27a647c7f0a193f04941ef6b484dfe2add24b21a3dd42f3d84aa6b4c1cfe804337bdbbc398edbd1fc5b2d4058738d9425bf63f6a5286e
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild
diff --git a/...center/gnome-control-center-3.14.2.ebuild → ...center/gnome-control-center-3.14.3.ebuild b/...center/gnome-control-center-3.14.2.ebuild → ...center/gnome-control-center-3.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild,v 1.1 2014/12/22 21:35:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.3.ebuild,v 1.1 2015/03/19 11:38:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -21,12 +21,6 @@ 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
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.91:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -84,7 +78,7 @@ COMMON_DEPEND="
 # 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.30
+	>=sys-apps/accountsservice-0.6.33
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
@@ -113,8 +107,6 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 
-	cups? ( sys-apps/sed )
-
 	gnome-base/gnome-common
 "
 # Needed for autoreconf

diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
@@ -1,3 +1,3 @@
 DIST gvfs-1.20.3.tar.xz 1558028 SHA256 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba SHA512 3a975b2014d7d82ec76062624343df4514d46a537cdcb3daf1cee2f77b7e0e06db123d3fb0de44987dc147c4023d2cfa9e46786378b1390d5957c16f4f14155e WHIRLPOOL 90285449626ffc284c798256f965188c3614efee6c1118bbaf1f8e178450e2bd8ddd9ec6d4f3e979ab6a789317848aae1afb3af9e3c3531af8865e99a90438f7
-DIST gvfs-1.22.2.tar.xz 1585720 SHA256 8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250 SHA512 aed00c84f5ee58ce8427f943b6097f7371d00ce36ec858a43b361b5b49161d0f0102d66edd8482416d5121eef43ad298ff55b5a3810bbb45a576e06ff004521f WHIRLPOOL e956ca886e78946396a4c477d21597b556f717822e5209d29bc5cbbc9478e39d3c26cd143af0590d4f3bf82a9acabb6b8b66ecd63204a3ab5d1a6c68d4f3639d
 DIST gvfs-1.22.3.tar.xz 1588072 SHA256 c778342e09a84d8c69b1b7ce7f943f6f2444a995bb0c0754ef1746afa8935182 SHA512 17e79047ce8f979ae15c99423ddc6d50a1d276151d4c0e1cc7e0c4958e0a9ed8bc4c0db8a38272eab50922bad6a51d915a2cd4cf41dfb0873faa49e1a3028ba7 WHIRLPOOL 2de23d3537683fcdb0af2fac42c98e05daf9cf4f5fb0d9e05dfa7b25e03852f2774ba1a1cfbebbd0602bbbbcbdbe36279dd9de6328fb3f495e2209c246b8a70a
+DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c