Make gtk dependency optional (bug #448868, thanks to wbrana). Drop useless doc USE flag. Switch to global introspection flag. Update to EAPI5, update license.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 45 insertions, 46 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 1bc8eaa01a46..aeb1bda2df90 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.270 2012/10/06 09:50:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.271 2012/12/27 18:05:52 tetromino Exp $
+
+  27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gconf-2.32.4.ebuild,
+  gconf-3.2.5.ebuild, metadata.xml:
+  Make gtk dependency optional (bug #448868, thanks to wbrana). Drop useless
+  doc USE flag. Switch to global introspection flag. Update to EAPI5, update
+  license.
 
   06 Oct 2012; Pacho Ramos <pacho@gentoo.org>
   -files/gconf-3.2.3-shutdown-crash.patch, -gconf-3.2.3-r1.ebuild,
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 4ce9c8a28500..d0753e2cdeef 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -4,15 +4,19 @@ Hash: SHA256
 AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 WHIRLPOOL 86c118fb0b571b5c47849fd4f7f09ade4ebf76324771fe9cccc64d95462cf3ab1a32de9a312412f843129025c41253d658a6546d7c3d9496451b9aacdf3b9451
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c
 DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf
-DIST GConf-3.2.5.tar.xz 1525188 SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
-EBUILD gconf-2.32.4.ebuild 2505 SHA256 47d776476935cf07b58bcd5c4e6f276b8cba7f8d9b01f1e852f5abd3b2dde189 SHA512 c730f7c0be1211499c477b462dfc0ecd7da9f4ccca8b889f14e58e49fe4c81faadf0927e284d33f0b542d686d5fa3019c779ec4b7054a1721dbffa2a1f6a6cff WHIRLPOOL e7e898b11d59b8d2296c873b81e92761ed78768eb62e6b5cdb5b0558519da35f4577ccb3c6eda0334c8ef8d80257b8338121bf56c5bc1e4b329c6fdf6c72272b
-EBUILD gconf-3.2.5.ebuild 3003 SHA256 f145ea3a8d25e8e0fc9fd1d4b30686e37c5b486a6c94ce3bfe2c286466262380 SHA512 ed31f25aa38c62ef8af56e0192e74bd78fa984565e5caee4d9cec93ea08c7143ff164d2d97cd88c243ac165e27d6c5334f89a745233e47a5cdc2095f0df5b3c9 WHIRLPOOL ab8881eeb691f0ae35f9776d7c80213b19361362fc4c7a5685ba0e4c90fe53022b3f052fd05d050209ea18c4f6bc12da9a51025ea5a72919dd2890927655c578
-MISC ChangeLog 36076 SHA256 9fb17ea4c2b1d5873d59012c2285239ae2cdb77f23bfc6a547365c27f9ffa4ed SHA512 d06edfec75aac3a3e1cb0ade977a5024b2489d029ae13c0586a2388219eba7e948ed42d2e37af6aef01b07f35c8ff19ad657a9d41888130586053ad52b47e455 WHIRLPOOL 5d6af85f0e57439a7f8fc9ba31183f425b1220138934b5f302959d68d9832d54a6605840d6845f9e1a6fb9353f2db28eaa36f1e0fd3fe0040ed5f4ac7ba6e0b4
-MISC metadata.xml 528 SHA256 ea091b9834e15c95b73eb692468c72deca61f4e2170ce5cdad77c175cbeb7aa9 SHA512 6b0b8ea2251d6bf9885798bc66dda29d1aba8a15a81054cd5f4649fd425e7904f25c6cd2be9afee6ee526d24106301c62014b7f2546a597477249d152cdf2e74 WHIRLPOOL b41a6632e7f54fd3549aab6b7b95857cece2e229290a520f7cade8a71f1edf12849e017ad4a564986714c3d88a201279e3069f4573500a5b372fecf81b11ec88
+DIST GConf-3.2.5.tar.xz 1525188 SHA256 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6 SHA512 d67427a275bc62531232d8cf9641135a03567aef7a97b014d86058df20279004b785b9bfaf11f4f5f88c7187c2b68a138074c5dd0d1e5e1347ebb2b394367926 WHIRLPOOL a1fc6a3bd1fe088438178cec9e891e2997abd1ffff6ddcec799c637dc2e2b7a57d1dbb939f281a28e7323ec9b5a31867ec21346919d963326583bafcb9226eb7
+EBUILD gconf-2.32.4.ebuild 2387 SHA256 85b3baf13c1606726ecf3a9f401270056cb6ee4847feea35e68010f0768b03e0 SHA512 c0530e7ba36203607b36ac6bdc85b4bed8bd2d702a61ba6ac09cca1c77ab19c73aa783cd9a73819d044b478bf94b23045d31f94c4c8c1800e3f8e0f1ba82eb5e WHIRLPOOL 74dbecc4fc5122a00a7aae770db34d1f481b7a1689f144d75484989508705f46a3417e643edf214aa95ea05781f85dc5f9797c5c34aabae72baf612983afb2f6
+EBUILD gconf-3.2.5.ebuild 2973 SHA256 f94e99dfe630ba42a2d0e49a6c3a93e23d459d3d7c7f41967e2cbca0c227c7f3 SHA512 69d930de2287e5aea5b6e43ec2133980d9a70610a5125c8ea7070e67d125b0726218b84ce4e71d751dcc702cb42acefdc77d7bf6c2db548262b35fd533bca693 WHIRLPOOL 9b534f75cba6ac0acaf4d86a763fccbf1049248afcccccfb6d9338675be9046d387151de4e72d93515e3f1e67e917e4168c19d8fc2771362d6c3ff5ca0824b3c
+MISC ChangeLog 36362 SHA256 5017d22483c5db9e95be95f7bd3f7eb84f747b0c02a84040b8a5bb64c8fa1d47 SHA512 e66d6714c2096e025de1675df912c79181c4c1870fc18f0e0c3caab54f81e5568203ac089eb87093272410dd6c536a449a8dd0900068a15962aa11e50aadbe03 WHIRLPOOL 524ff5e8363bbf45007dc416fb79c65aac28a15192dae950eac9742e16ec135ed5119f3144d463d0524f1a6585e0a67c63b5190e9b1b5f9a0e40bbca9037cec1
+MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBv/wUACgkQCaWpQKGI+9TJKgCeI9lpOz+7VeFm96tueyLD5fAg
-Az4An1Z/hv8YOvm0+xjJVeBgPf3JPtAe
-=m/j1
+iQEcBAEBCAAGBQJQ3I4BAAoJEJ0WA1zPCt1hUFkIALhyowsVpvfq3cxfm9y5I6fA
+floWM+vosKiVP3n5tPGtGBl0fzFFboLl1jCCibxjYKM8GOOveGFuEB0SVtPCPHFE
+zM3e+cvYzc9PDJ6MmhtaguJDJZfVAjeuAut/Hukr73a2EhGDoi6YDOHeB1oglk4V
+dh3FJ2DNI204cVGWbiAyWUH8dMNofAAjXgRoHmuk18rSSHMYH2NtPG5bl1zM89Va
+URx+K/CfgpyREQsdoaSi0RLDBAC4qcFjLn1yZl/MmqIO/tq6lqd0VJFDW+lJTXAH
+Xw9t/elVspND025UkGRSjAJgSWldVkDDzjWHbw9a/8kUO3F8zHTt4NVGD7Zm1Q4=
+=kTOb
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.32.4.ebuild b/gnome-base/gconf/gconf-2.32.4.ebuild
index bfd4516cb800..b62aaa17c268 100644
--- a/gnome-base/gconf/gconf-2.32.4.ebuild
+++ b/gnome-base/gconf/gconf-2.32.4.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.9 2012/10/06 09:50:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.10 2012/12/27 18:05:52 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="GConf"
 
 inherit eutils gnome2
 
-DESCRIPTION="Gnome Configuration System and Daemon"
+DESCRIPTION="GNOME configuration system and daemon"
 HOMEPAGE="http://projects.gnome.org/gconf/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc +introspection ldap policykit"
+IUSE="debug gtk +introspection ldap policykit"
 
 RDEPEND=">=dev-libs/glib-2.25.9:2
 	>=x11-libs/gtk+-2.14:2
@@ -24,27 +24,25 @@ RDEPEND=">=dev-libs/glib-2.25.9:2
 	>=gnome-base/orbit-2.4:2
 	>=dev-libs/libxml2-2:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	policykit? ( sys-auth/polkit )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
+	virtual/pkgconfig"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_prepare() {
 	G2CONF="${G2CONF}
-		--enable-gtk
 		--disable-static
 		--enable-gsettings-backend
-		--with-gtk=2.0
+		$(use_enable gtk)
+		"$(usex gtk --with-gtk=2.0 "")"
 		$(use_enable introspection)
 		$(use_with ldap openldap)
-		$(use_enable policykit defaults-service)"
+		$(use_enable policykit defaults-service)
+		ORBIT_IDL=$(type -P orbit-idl-2)"
 	kill_gconf
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
@@ -54,11 +52,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
 }
 
-src_compile() {
-	# Need host's IDL compiler for cross or native build, bug #262747
-	emake ORBIT_IDL=/usr/bin/orbit-idl-2
-}
-
 src_install() {
 	gnome2_src_install
 
@@ -67,7 +60,7 @@ src_install() {
 	# Make sure this directory exists, bug #268070, upstream #572027
 	keepdir /etc/gconf/gconf.xml.system
 
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
+	echo 'CONFIG_PROTECT_MASK="${EPREFIX}/etc/gconf"' > 50gconf
 	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
 	doenvd 50gconf
 	dodir /root/.gconfd
diff --git a/gnome-base/gconf/gconf-3.2.5.ebuild b/gnome-base/gconf/gconf-3.2.5.ebuild
index cf58fd77b0ec..379540829728 100644
--- a/gnome-base/gconf/gconf-3.2.5.ebuild
+++ b/gnome-base/gconf/gconf-3.2.5.ebuild
@@ -1,44 +1,43 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.4 2012/05/22 08:20:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.5 2012/12/27 18:05:52 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME_ORG_MODULE="GConf"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
 
-DESCRIPTION="Gnome Configuration System and Daemon"
+DESCRIPTION="GNOME configuration system and daemon"
 HOMEPAGE="http://projects.gnome.org/gconf/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc +introspection ldap orbit policykit"
+IUSE="debug gtk +introspection ldap orbit policykit"
 
 RDEPEND=">=dev-libs/glib-2.31:2
-	>=x11-libs/gtk+-2.90:3
 	>=dev-libs/dbus-glib-0.74
 	>=sys-apps/dbus-1
 	>=dev-libs/libxml2-2:2
+	gtk? ( >=x11-libs/gtk+-2.90:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	orbit? ( >=gnome-base/orbit-2.4:2 )
 	policykit? ( sys-auth/polkit )"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
+	virtual/pkgconfig"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_prepare() {
 	G2CONF="${G2CONF}
-		--enable-gtk
 		--disable-static
 		--enable-gsettings-backend
-		--with-gtk=3.0
+		$(use_enable gtk)
+		"$(usex gtk --with-gtk=3.0 "")"
 		$(use_enable introspection)
 		$(use_with ldap openldap)
 		$(use_enable orbit)
@@ -46,9 +45,7 @@ pkg_setup() {
 		ORBIT_IDL=$(type -P orbit-idl-2)"
 		# Need host's IDL compiler for cross or native build, bug #262747
 	kill_gconf
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
index c4841b9bc944..07f0b7f4661a 100644
--- a/gnome-base/gconf/metadata.xml
+++ b/gnome-base/gconf/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 	<flag name="ldap">Build backend which enables default mail accounts,
 	addressbooks and calendars for Evolution to be configured using each
 	user's LDAP entry."</flag>