Apply team policy.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 23 insertions, 15 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 5a56413ff94f..262e88e83b2c 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.69 2013/04/07 07:34:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.70 2013/04/07 10:49:28 eva Exp $
+
+  07 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> glabels-3.0.1-r1.ebuild:
+  Apply team policy.
 
 *glabels-3.0.1-r1 (07 Apr 2013)
 
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index a9288613edc4..46b1bd50b852 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 AUX glabels-3.0.1-eds-3.6.patch 2511 SHA256 e7f5d8296779e5b811acd7eff57ea2cee37862f7c2796092966c648ead551c7c SHA512 36dfc088354b95721bc4c41309b37e808771ffa564059d623e4c64c67e6361c4bae16f9f4aaac259cbd63afc69add91d8eac8424e4b054de5f991fa71ea6a811 WHIRLPOOL 28bc487565575eca9932982376cf3958017d006801649327879241680050add15f56d4f68b7b2a0e3d7d75c42edb8a088190f792fe8acafddec966ebe3c7ca14
 DIST glabels-3.0.1.tar.xz 3310944 SHA256 99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2 SHA512 810898741724e0f51e83387f9db17958b000703932d7d52105520f06940036944fbb239b5ef0720175f50ff5af7dac418c6040e3f7baa23268ad7b31ec8aaaaf WHIRLPOOL 44f3bed4a3761c4bcb0c822b755e1ca180ef2a75550857a5e726b8f2ca655fb0a94c932330eb15e47a0630f5ef36475d762f32b59e75ea568260c7d69932095c
-EBUILD glabels-3.0.1-r1.ebuild 1276 SHA256 b3561c28cc4d46eb96ccbbec6c93f05afaef31d91ea8285e311afb7f5209b189 SHA512 95b4d95f8dfb2ee03b95cf7aa87b986ee70f73c4023ac670a0ed15186836f602c49bc0927d981a4d3c8dc14a8e790902d1139ea7c8511c5527c5f45cd4e4fe63 WHIRLPOOL f1ac89737645c53f5455db64cb33343cd976f9dcd53a784ebed6ae7d7dcafa8286628d5dc5658ee5e51806d2c80a32e6198203fa22500397b64b53f35407ef78
+EBUILD glabels-3.0.1-r1.ebuild 1304 SHA256 b14ef745deed899318313b642cb761824963cd5408a575bb33876a47251aaaba SHA512 b5ff33a367e6cb9e0ae58507d1791387037c15dabb4b58069f86fe075713e0dddebbedf24f6baab7c4b444934e9f994b0ada3ac89d8ddc1e3645baa5be8eb57d WHIRLPOOL 61a21c275a2e7340d87599a72304bdeda441d70db92a346231c4792ea66823e7e60488b8b6e52d404d0440863c024180b91b0d5544ae9376acee4ceb1627269a
 EBUILD glabels-3.0.1.ebuild 1266 SHA256 b33d82ff83dcc4ab0f848ac29090395b455194f3a02fb406f7eb9fa70b0b4829 SHA512 112adc890b15bbde8082f7f3cf6871a75415be1e1fd471273cc24ac1e9cc455d10179cbce5f62266ab91059c6ffade16d0347a0bc1dc17040a8484afc81c682d WHIRLPOOL 80dd4fd38f1bf0a20a4ba6cb05c01db83750defb2aeef7f171637cf32e907f1a25b61fd37264a8d46ef62f2c50b5f82d6d4f77ee2ae3820dec40f4ac663cf12a
-MISC ChangeLog 10905 SHA256 036dbc9f14230334e5bb06216d1d60d607554e44a9cef910778fefc61d801f8a SHA512 c814c541c3ddc72b0101cd7cb9ef8b49d9f705a318278ebba605576154fbd62eb60238a260b8e92aa67d8e3ac5d0477c51dcfa566fc197bbe73cc092d99c9625 WHIRLPOOL 6008bc94d2df8b688815dcdac9e3743f412b0f918864a0a05bac04feab68ed24d7188df31a81d17215d46e23ce759bc87c83a811b99410d26d6214e21a75ce86
+MISC ChangeLog 11004 SHA256 f407faaaa1587c2bdcc22ff20ab62357b5df8a04f194f57f7a97cd4628f7aca5 SHA512 b2655bbd8dae5a92e194adbcff2ae9e251b5b695ca77a309f43bacc939046f6ceaa24e302f8cdf4f7f463159ea5bc59d8c12f4f4d0776771d37923498854017a WHIRLPOOL f788881aa4613a604817d566c203629847803b73565623c6bdf7da9c91cfe456b0d404cac9791dfda0606298f38cfd971c3cb77a3c9b959cb1d9c940a694a057
 MISC metadata.xml 535 SHA256 3f7047af8b04690c462c06b2ab838b2a38150f610523ad8e31451821f07c5d7a SHA512 8fc6d7b5a7dfb5df35a5ea73a657c9d3177daaf9ef6711dde10beab7544c7d9bf8eac73f9483907ba2ed895ce318c2774abbad62a963ae6d58221fe1ee409ee0 WHIRLPOOL 2495f07b313c795d7815a4aadf19ac423cedeb9aa6296d75d7e3ff53b6e1443e10bf452d12f2cc09a3cf8df27388e27b3264b32e88b9aa658fca467b069234c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFhIY8ACgkQCaWpQKGI+9Su0gCfZmIywSiD2llOBg3Q72p869UB
-tioAnRDV9ijOSB1Y9bZFIHRkSnVZFfwz
-=crmR
+iEYEAREIAAYFAlFhTzkACgkQ1fmVwcYIWAat/wCgsCTYgFrtlhdmvwcAoZKleEzX
+PjMAn3BVlV7ZrGVN1gpI7Y++ycasdi+y
+=uuau
 -----END PGP SIGNATURE-----
diff --git a/app-office/glabels/glabels-3.0.1-r1.ebuild b/app-office/glabels/glabels-3.0.1-r1.ebuild
index 9e93097999e3..dbffc38ee66f 100644
--- a/app-office/glabels/glabels-3.0.1-r1.ebuild
+++ b/app-office/glabels/glabels-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.1-r1.ebuild,v 1.1 2013/04/07 07:34:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.1-r1.ebuild,v 1.2 2013/04/07 10:49:28 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="barcode eds"
 
-RDEPEND=">=dev-libs/glib-2.28.2:2
+RDEPEND="
+	>=dev-libs/glib-2.28.2:2
 	>=x11-libs/gtk+-3.0.9:3
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/librsvg-2.32.0:2
@@ -24,20 +25,18 @@ RDEPEND=">=dev-libs/glib-2.28.2:2
 	barcode? (
 		>=app-text/barcode-0.98
 		>=media-gfx/qrencode-3.1 )
-	eds? ( >=gnome-extra/evolution-data-server-2.30.3 )"
+	eds? ( >=gnome-extra/evolution-data-server-2.30.3 )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
 	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.28
+	virtual/pkgconfig
 "
-src_prepare() {
-	G2CONF="${G2CONF}
-		$(use_with eds libebook)
-		--disable-static"
 
+src_prepare() {
 	# Fix desktop entry, upstream bug #684612
 	sed -i -e 's/.png//' data/desktop/glabels-3.0.desktop.in || die
 	sed -i -e '/Encoding/d' data/desktop/glabels-3.0.desktop.in || die
@@ -45,3 +44,9 @@ src_prepare() {
 	# Fix building with eds-3.6 (from master)
 	epatch "${FILESDIR}/${PN}-3.0.1-eds-3.6.patch"
 }
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with eds libebook) \
+		--disable-static
+}