Version bump.

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

5 files changed, 134 insertions, 3 deletions

diff --git a/sci-electronics/oregano/ChangeLog b/sci-electronics/oregano/ChangeLog
index 3722b0410093..6c9f220edc11 100644
--- a/sci-electronics/oregano/ChangeLog
+++ b/sci-electronics/oregano/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/oregano
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.38 2010/08/22 09:32:50 tomjbe Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.39 2011/02/14 02:01:31 rafaelmartins Exp $
+
+*oregano-0.69.1 (14 Feb 2011)
+
+  14 Feb 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  +oregano-0.69.1.ebuild, +files/oregano-0.69.1-desktop_file_update.patch,
+  +files/oregano-0.69.1-scons_env_flags.patch:
+  Version bump.
 
 *oregano-0.69.0-r1 (22 Aug 2010)
 
diff --git a/sci-electronics/oregano/Manifest b/sci-electronics/oregano/Manifest
index d51ef3991b29..95a5343dd269 100644
--- a/sci-electronics/oregano/Manifest
+++ b/sci-electronics/oregano/Manifest
@@ -1,7 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX oregano-0.60.0-dont-run-update-mime-database.patch 858 RMD160 b60928e7ee836c441a89255094f07b0189542f2c SHA1 08fdb62d9eb29bacd9bdffc62f14ff527ba5e51d SHA256 d768d146bf092cab0ac80bd223eb0b4ce069dc1728f0c11573caff53a37d0c7f
 AUX oregano-0.69.0-ldflags.diff 391 RMD160 4b739155757858cb5aa1abfee3b6591475746685 SHA1 b2c82434d4ccdeed74c1120ef68794155e25527b SHA256 b5331840f62a94835413dd65a71ff3230b495af235373183f2e68b978f1c2480
+AUX oregano-0.69.1-desktop_file_update.patch 962 RMD160 fd9584e764fb7cc4010781956c8e5c479af2d5cd SHA1 1fcbcf3fb788b6fd70942f3b60be52ae3c1a0e40 SHA256 7cbe2a11d5f9a62b6a488cd0069c639b6d51f58ad136b20e2ad23b403ba52c92
+AUX oregano-0.69.1-scons_env_flags.patch 943 RMD160 e117ac923d1c1f9f443ef26af26acc0722e14b05 SHA1 242bd3a343a0a26576dbadc3ab06d9da5b242799 SHA256 8b5a450daece05ea83430c48d96f9b28107f99a8d90741ca835a0ff3bbfa5769
 DIST oregano-0.69.0.tar.gz 640385 RMD160 ea71522aca807b82f8ce50d598014e518fdd08e7 SHA1 1fd3a7396a596a2f9016dbc682c7d37771148205 SHA256 86242822ba08be50b00e81a0afc7a5b9d8ab5e1ff2023707a362a87f597f107a
+DIST oregano_0.69.1.orig.tar.gz 673785 RMD160 30a2c3940ffc6a96d4b0abcaa2257390e48a2bbe SHA1 3cc270717cf1d3c1954cfc83350a3a14d98c4f26 SHA256 ec96f6d113c642aa423d4abf9d667802bc3754eda8a9f4e287b8b9cefbb4b589
 EBUILD oregano-0.69.0-r1.ebuild 1447 RMD160 cbed1426869c5b7eee1781dd37340df8b1db29b7 SHA1 d502ac6cfc7e6f3affc73de7beb25dce90196392 SHA256 793f7467d24649ed1f4244454c5e48c8daff9209734f3c6ffe0928e88e81b6d4
 EBUILD oregano-0.69.0.ebuild 1401 RMD160 5f94ba15c0c99c0aab741c331912ba0a93f34331 SHA1 2708769bd821c1aa0426eafb1afb9089aaf2f1a2 SHA256 faffcfc7abac1e2a3d1c26e630fb4174ea68e20945481f8fc190f1c71f8f9c89
-MISC ChangeLog 6805 RMD160 caa66a9c7a444d9844d4c50e6db162b17e4003b8 SHA1 8f0b9c669dc4c7b787ae6c27ebfb3198c816cc87 SHA256 f4fef400ad04769397fe511d284b1a0c1858624dddc054e78f9a3f11bf5b056d
+EBUILD oregano-0.69.1.ebuild 1548 RMD160 3a586d7c08931f9bf3c29b71c4bd82a95a3503cd SHA1 0ac4514b2c3905b51f8138f311ea652614e54630 SHA256 62167e0fe1b0e86aa288cc5cf178dc834461f8dd69f546d6d5b11a0b6c873efd
+MISC ChangeLog 7042 RMD160 9c05c1ad0dd4f138406f9985e89ba58263cb89d8 SHA1 175db9ddf5315b0758e70480e7723f217a88df31 SHA256 104f898004a607243d7ab266994f2421263b90e9708459b10ada595d82fd8f80
 MISC metadata.xml 396 RMD160 a3b0d0c614542c4ab5226db80ce0d0425cba5894 SHA1 8c34d29a034de1295e18b38b2da543089eca8a1e SHA256 f4b0c09bb67ede05a065279a794b16ff245252fc8faf07c28d928294347f0c87
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNWI0JAAoJEMmH5mwCk1NvkBoH/RtdjSnajquuzLwBD5eH7Rn0
+91gYQH/TExZUIwWa8ZXIKkT4AyuAmx4gLSYj/0toFxJ9Qr7qvpO6a9d3n8hMfVTA
+ZeeJ7GeNdisS9xYGQxR4tpyYvHoeTuEuDNCe93UPGQTY6+t2tpLffpWkcZ0tPT9s
+ZQzpG7mS9YKv/IGPYODFcPhtgTjmhia6fbcYXWA3yV14+xEi13qdyivdbgDSrfTE
+V7bWT8mem5khvsUlmHPBvbwp4Mn+C68hU2jxeY8yUnqwEnfMMkyAxgpGZrBUzlYF
+R1aIVT2OanY5L9zFycItdI4F/SfNSCF4tu13wRMPnv5Q9Ze1LxdfAc5xYfGSbM0=
+=yBzz
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch b/sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch
new file mode 100644
index 000000000000..5d3b2ef6d35a
--- /dev/null
+++ b/sci-electronics/oregano/files/oregano-0.69.1-desktop_file_update.patch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## desktop.file.update.dpatch by Maximiliano Curia <maxy@debian.org>
+##
+## DP: Update categories and name of desktop file
+
+@DPATCH@
+diff -urNad oregano-0.69.1~/oregano.desktop oregano-0.69.1/oregano.desktop
+--- oregano-0.69.1~/oregano.desktop	2009-07-07 12:49:49.000000000 -0300
++++ oregano-0.69.1/oregano.desktop	2009-07-22 20:41:53.209525839 -0300
+@@ -1,8 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=Oregano electrical engineering tool
+-Name[ca]=Eina d'enginyeria elèctrica Oregano
+-Name[es]=Oregano, herramienta para la ingeniería electrónica
++Name=Oregano
+ GenericName=Electrical engineering tool
+ GenericName[ca]=Eina d'enginyeria elèctrica
+ GenericName[es]=Herramienta para la ingeniería electrónica
+@@ -17,5 +15,5 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Science;Education;Physics;
++Categories=GNOME;GTK;Science;Education;Electronics;
+ MimeType=application/x-oregano;
diff --git a/sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch b/sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch
new file mode 100644
index 000000000000..6e999e44e586
--- /dev/null
+++ b/sci-electronics/oregano/files/oregano-0.69.1-scons_env_flags.patch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## scons.env.flags.dpatch by Maximiliano Curia <maxy@debian.org>
+##
+## DP: Honour the CFLAGS and LDFLAGS environment variables
+
+@DPATCH@
+diff -urNad oregano-0.69.1~/SConstruct oregano-0.69.1/SConstruct
+--- oregano-0.69.1~/SConstruct	2009-07-07 12:49:49.000000000 -0300
++++ oregano-0.69.1/SConstruct	2009-07-22 19:59:31.665525831 -0300
+@@ -76,9 +76,14 @@
+ mo_bld = Builder (action = mo_builder)
+ 
+ CEnv.Append (BUILDERS = {'MoBuild' : mo_bld})
+-CEnv.Append (CCFLAGS = Split ('-Wall'));
+-if CEnv['Debug']:
+-	CEnv.Append (CCFLAGS = Split ('-g'));
++if ( os.environ.has_key('CFLAGS') ):
++	CEnv.Append (CCFLAGS = Split (os.environ['CFLAGS']))
++else:
++	CEnv.Append (CCFLAGS = Split ('-Wall'))
++	if CEnv['Debug']:
++		CEnv.Append (CCFLAGS = Split ('-g'))
++if ( os.environ.has_key('LDFLAGS') ):
++	CEnv.Append (LINKFLAGS = Split (os.environ['LDFLAGS']))
+ 
+ # Check dependencies #
+ if not CEnv.GetOption ('clean'):
diff --git a/sci-electronics/oregano/oregano-0.69.1.ebuild b/sci-electronics/oregano/oregano-0.69.1.ebuild
new file mode 100644
index 000000000000..cd1e10cfa07d
--- /dev/null
+++ b/sci-electronics/oregano/oregano-0.69.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.69.1.ebuild,v 1.1 2011/02/14 02:01:32 rafaelmartins Exp $
+
+EAPI="4"
+
+inherit eutils fdo-mime scons-utils
+
+DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits."
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+HOMEPAGE="http://oregano.gforge.lug.fi.uba.ar/" # broken
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+IUSE=""
+
+CDEPEND=">=dev-libs/libxml2-2.6
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/libglade-2.5
+	>=gnome-base/libgnome-2.12
+	>=gnome-base/libgnomeui-2.12
+	>=gnome-base/libgnomecanvas-2.12
+	>=gnome-base/libgnomeprint-2.12
+	>=x11-libs/cairo-1.2
+	>=x11-libs/gtksourceview-2.0"
+DEPEND="${CDEPEND}
+	>=dev-util/scons-0.96.1
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu"
+
+src_prepare() {
+	# patches from debian
+	epatch "${FILESDIR}/${P}-desktop_file_update.patch"
+	epatch "${FILESDIR}/${P}-scons_env_flags.patch"
+}
+
+src_compile() {
+	escons --cache-disable PREFIX=/usr || die 'escons failed.'
+}
+
+src_install() {
+	escons --cache-disable PREFIX=/usr DESTDIR="${D}" RunUpdateMimeDatabase=no \
+		install || die 'escons install failed.'
+	dodoc AUTHORS NEWS README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	elog "You'll need to emerge your prefered simulation backend"
+	elog "such as spice, ng-spice-rework or gnucap for simulation"
+	elog "to work."
+}