Removed debug USE flag as upstream says it doesn't work in this release and will be fixed for the next one. Fixed icon cache updates. Added dependency to electronics-menu.

Package-Manager: portage-2.1.7.1/cvs/Linux i686

3 files changed, 30 insertions, 10 deletions

diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog
index 10b2943c4edd..5c801b8eb491 100644
--- a/sci-electronics/geda/ChangeLog
+++ b/sci-electronics/geda/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-electronics/geda
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.51 2009/11/05 23:49:11 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.52 2009/11/17 18:20:22 calchan Exp $
+
+*geda-1.6.0-r1 (17 Nov 2009)
+
+  17 Nov 2009; Denis Dupeyron <calchan@gentoo.org> -geda-1.6.0.ebuild,
+  +geda-1.6.0-r1.ebuild:
+  Removed debug USE flag as upstream says it doesn't work in this release
+  and will be fixed for the next one. Fixed icon cache updates. Added
+  dependency to electronics-menu.
 
 *geda-1.6.0 (05 Nov 2009)
 
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index 545e07596e55..050fc2dc6409 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -27,6 +27,6 @@ EBUILD geda-1.4.0-r1.ebuild 3513 RMD160 22a51ab72e7aed911dc99995b193e00e36ec6411
 EBUILD geda-1.4.1.ebuild 3514 RMD160 83c61afe90a65a4743892dab71a6018e9d0dd96b SHA1 300ef6c038c6c4e247bd90822c0e345d13af2767 SHA256 d38080f1aea34bf6f6447e7a5a57bb7ca158cd61e761f4cdf7b28a2d8103a8bd
 EBUILD geda-1.4.3-r1.ebuild 792 RMD160 15424e4c5e5b515892653adb25fc2fdddfe60bdf SHA1 ba23322821bbf408d951f4145f2d0062460fb0a4 SHA256 cfc5a0f264f41a6fc9025092fe4aff64aca4e3bf6e25db68af59f0970740c608
 EBUILD geda-1.4.3.ebuild 3534 RMD160 cd5abb3717099184746d7229d9dd752541bf99fc SHA1 d5dc39b9ea380697713d70ac15343a7b1f381ea9 SHA256 ae914f6886071e40fefab0ea05fe2469c390e7cc8e62f2d6841167b2d526bd1b
-EBUILD geda-1.6.0.ebuild 1914 RMD160 98b36c9ed458504c59498687f4339c352cfe42de SHA1 df8b4296ebdd806bec0d4522c74f734791f68aa1 SHA256 53a1093f4f44380e0c15ef5c5508239baeeefcd17b8399b5fa828871a9939630
-MISC ChangeLog 7818 RMD160 2d8150fd2ffbe851639406fed13d26b62a14bf22 SHA1 85f14d3c23d60420987669ff8ed4ecda6431f9e4 SHA256 75dedb9ff3cc90d1181471f9a381674a51add5e84258387fd1350578f1f4845a
+EBUILD geda-1.6.0-r1.ebuild 2293 RMD160 1585bbc3dc9476862b94f2758519742452c977e4 SHA1 aac5fdce344ba18d45c195bb7a6f6068999722a8 SHA256 d88c2d35198148415bf601bc04b28bd30ebf37fdc62b494da3488741f2707752
+MISC ChangeLog 8123 RMD160 83c0784e60c366c88a1ce00ac4df517e28b094c9 SHA1 05c4ef009f34343e488fcf069dd08f85dca1dda6 SHA256 1692492c1085af3469d3dd16a63f212615ec7eef669615edec31d97976cec30f
 MISC metadata.xml 514 RMD160 21e86e05116530592ba8301b94395148a0cf03ef SHA1 b5e306f709a67c76b8438250885fb01c3ec6dbc4 SHA256 40e0bc8305a62f8c4521fadb462149e0b0c679d1a127a10484164784e75f8ae7
diff --git a/sci-electronics/geda/geda-1.6.0.ebuild b/sci-electronics/geda/geda-1.6.0-r1.ebuild
index d97800674958..e7f5f0151404 100644
--- a/sci-electronics/geda/geda-1.6.0.ebuild
+++ b/sci-electronics/geda/geda-1.6.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.6.0.ebuild,v 1.1 2009/11/05 23:49:11 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.6.0-r1.ebuild,v 1.1 2009/11/17 18:20:22 calchan Exp $
 
 EAPI="2"
 
-inherit fdo-mime versionator
+inherit fdo-mime versionator gnome2-utils
 
 MY_P="${PN}-gaf-${PV}"
 DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
@@ -14,9 +14,12 @@ SRC_URI="http://geda.seul.org/release/v$(get_version_component_range 1-2)/${PV}/
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug doc examples nls stroke threads"
+# Do not stabilize 1.6.0, upstream says it's suboptimal. Calchan, 20091117.
+IUSE="doc examples nls stroke threads"
+# Removed the debug USE flag from above because it's currently broken. Make sure
+# to add it back when upstream fixes it. Calchan, 20091117.
 
-RDEPEND="
+CDEPEND="
 	>=dev-libs/glib-2.12
 	>=x11-libs/gtk+-2.10
 	>=x11-libs/cairo-1.2.0
@@ -24,7 +27,7 @@ RDEPEND="
 	nls? ( virtual/libintl )
 	stroke? ( >=dev-libs/libstroke-0.5.1 )"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	!sci-libs/libgeda
 	!sci-electronics/geda-gschem
 	!sci-electronics/geda-symbols
@@ -38,6 +41,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.15.0
 	nls? ( >=sys-devel/gettext-0.16 )"
 
+RDEPEND="${RDEPEND}
+	sci-electronics/electronics-menu"
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
@@ -67,12 +73,18 @@ src_install() {
 	dodoc AUTHORS NEWS README
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
-	fdo-mime_mime_database_update
 	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
 	fdo-mime_desktop_database_update
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }