Use gnome2.eclass for gconf schema(s).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 37 insertions, 29 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index 060205512196..3c126fcbbb21 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/stardict
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.13 2012/01/08 17:47:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.14 2012/01/08 18:31:37 ssuominen Exp $
+
+  08 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> stardict-3.0.3.ebuild:
+  Use gnome2.eclass for gconf schema(s).
 
   08 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> stardict-3.0.3.ebuild:
   Missing CPL-1.0 and LGPL-2 licenses as noted by top level README.
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 31ea831ad83f..eae59f5c1bca 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -21,17 +21,17 @@ DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b7
 DIST stardict-3.0.3.tar.bz2 9147947 RMD160 4c63f3cf439a7c34829b371e75c16db97fb35fd1 SHA1 5043c0918963cd4d40e6d6289353f295766ec74f SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73
 EBUILD stardict-3.0.1-r2.ebuild 3022 RMD160 d75d427d66563eb47d6950e78175ffac644b9f20 SHA1 013fe46caed49f9dc936f4a1d75ba4892f0bc807 SHA256 20830c859142f16a68d0e577266b3c30225abb8d8755825f623c76d52b3d94fc
 EBUILD stardict-3.0.1-r3.ebuild 3103 RMD160 41155f59f3fd97eab8b3f126d7f13d0ddc0f0ac8 SHA1 f2d8258dd8dca1e0a674442e25f5d01fa396dbfc SHA256 8083f1ba8062d4dadc2026206202e65977e79b9478bb26dc6597329228775361
-EBUILD stardict-3.0.3.ebuild 3022 RMD160 62c1c284408f3857c7196062b8169230d9936cf4 SHA1 e33b37a62edb92cc3ed6cb9596505850ef906dac SHA256 3cf03d9c90cf8c76fe13c50e02120fc5fc5358ec865daf287e180db994c6d75e
-MISC ChangeLog 11691 RMD160 1a9cc49373d3c8cc40c0ebdf662326dd0dde9fca SHA1 40cb26862047e30167797ebc6f0a302cb1ad5a69 SHA256 1a3c90343a90bb23cd3d2a24620d1f87d3d6076834c2f6dfff2de9900244377f
+EBUILD stardict-3.0.3.ebuild 3028 RMD160 aea42752c1fca8873653d45576bdfc57f91163ef SHA1 ed76b47a481312fe9199325c9414f452af043d8c SHA256 313a6c9cfaf372100017a13b3bd4499246327e77d197483faf0d3e1fa9b504f6
+MISC ChangeLog 11810 RMD160 5e7951673a7a8cbe1cc653b4e99e0f9588767df4 SHA1 50d32e69ba42280e2c30ec39b197b9be4fac6efb SHA256 5e8ab0adfde910a2e4a19c5d3d798e44d87ed9fd87ee89e4d0d795d14218ded6
 MISC metadata.xml 1118 RMD160 61e3ee3d4ea189024ce2f7fa5c59ac8b758cae82 SHA1 755adaa6d7aad1cea44eb4de65df3156adc59a46 SHA256 c6f8ba52202b6c8383cff2cd2ee0f4fda1a29c9019488fd1cb4369ef400a95a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPCdftAAoJEEdUh39IaPFN3jYH/jUzZzYy+JGB6EdQPvb4G6yL
-/WaPt2Gbvbdj5zF9929gTGbkD+CYA6fRWxbPzW0OEduootGk00fBaxZBm9dFYCVG
-OOCi0YCWfBrf7ZwFmFKAfYuZM6E721Co+cManF2uzqIuErDxcPKt4VQ9R+ggoUbr
-1KxRjvH9NMttkBExRGqcfPGxmBz1YTiHq9WtZBvu/rCPIpLYwQFtjJ3bAbcHRDLZ
-Jlv8URDw6p5f97XEOXz//VsUiawG4V2NX1PemmoUctzZBgqmLPi4XcWpwLMIxzeZ
-CdPCCm+WJoIl2NXN9NleCqRS87X4QNMx+U4jEsWEwSdThBqwDQqETA8vqWYc56Q=
-=8T96
+iQEcBAEBAgAGBQJPCeC7AAoJEEdUh39IaPFNwFgIAJncXbkXb+V2q0uQ8FYemdsm
+Oc12Utmrw9gXtDG6DcgwwoMYZ3LFWWJE1Bfb/+38g9WVoCedIKZDqXOCvuDYaY4e
+U6QXrcB4ORNhpZiN+H0OSMHGHKYt5z2kWjYYyZKT3NbOKo8JFmq1Vgq7ouWQp1UL
+Rx7DEyp0JFEDrVtsU96N5+xpc6DN7QKpfLiiL+nTFafiwa8o5g7t49OBumfQZygG
+T/QT2ncCUvjVqvZM1palerYcoOjbmyrC5ZU/5+bovp9rsIOGADexozE7Fe5IoMtH
+/lLVtb8CPoEi20FCLjttMoDIqvVaMH9paOz3tnufCclIFEAe9EKdYdlV5a07ltY=
+=svSI
 -----END PGP SIGNATURE-----
diff --git a/app-text/stardict/stardict-3.0.3.ebuild b/app-text/stardict/stardict-3.0.3.ebuild
index aaf8394394bf..84c5650f22d0 100644
--- a/app-text/stardict/stardict-3.0.3.ebuild
+++ b/app-text/stardict/stardict-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3.ebuild,v 1.4 2012/01/08 17:54:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3.ebuild,v 1.5 2012/01/08 18:31:37 ssuominen Exp $
 
 # NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
 #       their indexes seem to be in a different format. So we'll keep them
@@ -9,7 +9,11 @@
 # NOTE: Festival plugin crashes, bug 188684. Disable for now.
 
 EAPI=4
-inherit eutils
+
+GNOME2_LA_PUNT=yes
+GCONF_DEBUG=no
+
+inherit eutils gnome2
 
 DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
 HOMEPAGE="http://code.google.com/p/stardict-3/"
@@ -52,30 +56,31 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
+pkg_setup() {
+	G2CONF="$(use_enable editor tools)
+		--disable-scrollkeeper
+		$(use_enable spell)
+		$(use_enable gucharmap)
+		--disable-festival
+		$(use_enable espeak)
+		$(use_enable qqwry)
+		--disable-updateinfo
+		$(use_enable gnome gnome-support)
+		--disable-gpe-support
+		--disable-schemas-install"
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-correct-glib-include.patch \
 		"${FILESDIR}"/${P}-entry.patch \
 		"${FILESDIR}"/${P}-gcc46.patch
-}
 
-src_configure() {
-	econf \
-		$(use_enable editor tools) \
-		--disable-scrollkeeper \
-		$(use_enable spell) \
-		$(use_enable gucharmap) \
-		--disable-festival \
-		$(use_enable espeak) \
-		$(use_enable qqwry) \
-		--disable-updateinfo \
-		$(use_enable gnome gnome-support) \
-		--disable-gpe-support \
-		--disable-schemas-install
+	gnome2_src_prepare
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	gnome2_src_install
 
 	dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
 
@@ -91,8 +96,6 @@ src_install() {
 		insinto /usr/share
 		doins -r ../WyabdcRealPeopleTTS
 	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {
@@ -105,4 +108,6 @@ pkg_postinst() {
 	elog "you have not, execute the below to get a list of dictionaries:"
 	elog
 	elog "  emerge -s stardict-"
+
+	gnome2_pkg_postinst
 }