Fix for bug #333869 wrt respecting LDFLAGS

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 74 insertions, 2 deletions

diff --git a/sci-electronics/oregano/ChangeLog b/sci-electronics/oregano/ChangeLog
index 49d2b3caf1e8..3722b0410093 100644
--- a/sci-electronics/oregano/ChangeLog
+++ b/sci-electronics/oregano/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2010/07/24 06:44:44 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.38 2010/08/22 09:32:50 tomjbe Exp $
+
+*oregano-0.69.0-r1 (22 Aug 2010)
+
+  22 Aug 2010; Thomas Beierlein <tomjbe@gentoo.org>
+  +oregano-0.69.0-r1.ebuild, +files/oregano-0.69.0-ldflags.diff:
+  Fix for bug #333869 wrt respecting LDFLAGS
 
   24 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> -oregano-0.40.5.ebuild,
   -oregano-0.60.0.ebuild, -files/oregano-0.60.0-install-icon.patch:
diff --git a/sci-electronics/oregano/Manifest b/sci-electronics/oregano/Manifest
index 77189ddfe58b..d51ef3991b29 100644
--- a/sci-electronics/oregano/Manifest
+++ b/sci-electronics/oregano/Manifest
@@ -1,5 +1,7 @@
 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
 DIST oregano-0.69.0.tar.gz 640385 RMD160 ea71522aca807b82f8ce50d598014e518fdd08e7 SHA1 1fd3a7396a596a2f9016dbc682c7d37771148205 SHA256 86242822ba08be50b00e81a0afc7a5b9d8ab5e1ff2023707a362a87f597f107a
+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 6608 RMD160 c18b2c81a976c8288967c9f9750c5c49c4fb8dea SHA1 c66a7125cd283e59fdbabefb877d50d633932922 SHA256 d37a2560d81b8f7b11970399e650be737157323ebc87a53bc28775cb3fdec61a
+MISC ChangeLog 6805 RMD160 caa66a9c7a444d9844d4c50e6db162b17e4003b8 SHA1 8f0b9c669dc4c7b787ae6c27ebfb3198c816cc87 SHA256 f4fef400ad04769397fe511d284b1a0c1858624dddc054e78f9a3f11bf5b056d
 MISC metadata.xml 396 RMD160 a3b0d0c614542c4ab5226db80ce0d0425cba5894 SHA1 8c34d29a034de1295e18b38b2da543089eca8a1e SHA256 f4b0c09bb67ede05a065279a794b16ff245252fc8faf07c28d928294347f0c87
diff --git a/sci-electronics/oregano/files/oregano-0.69.0-ldflags.diff b/sci-electronics/oregano/files/oregano-0.69.0-ldflags.diff
new file mode 100644
index 000000000000..dc4bac4b12cc
--- /dev/null
+++ b/sci-electronics/oregano/files/oregano-0.69.0-ldflags.diff
@@ -0,0 +1,12 @@
+--- SConstruct.old	2010-08-22 09:15:34.000000000 +0000
++++ SConstruct	2010-08-22 09:18:54.000000000 +0000
+@@ -80,6 +80,9 @@
+ if CEnv['Debug']:
+ 	CEnv.Append (CCFLAGS = Split ('-g'));
+ 
++if 'LDFLAGS' in os.environ:
++	CEnv.Append(LINKFLAGS = os.environ['LDFLAGS'])
++
+ # Check dependencies #
+ if not CEnv.GetOption ('clean'):
+ 	Cconf = Configure (CEnv, custom_tests = {'CheckPkg' : CheckPkg })
diff --git a/sci-electronics/oregano/oregano-0.69.0-r1.ebuild b/sci-electronics/oregano/oregano-0.69.0-r1.ebuild
new file mode 100644
index 000000000000..5b91a213a014
--- /dev/null
+++ b/sci-electronics/oregano/oregano-0.69.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.69.0-r1.ebuild,v 1.1 2010/08/22 09:32:50 tomjbe Exp $
+
+inherit eutils fdo-mime
+
+DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits."
+SRC_URI="http://gforge.lug.fi.uba.ar/frs/download.php/86/${P}.tar.gz"
+HOMEPAGE="http://oregano.gforge.lug.fi.uba.ar/"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND=">=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-1*"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.96.1
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.60.0-dont-run-update-mime-database.patch \
+		"${FILESDIR}"/${P}-ldflags.diff
+}
+
+src_compile() {
+	scons --cache-disable \
+		PREFIX=/usr \
+		|| die "scons make failed"
+}
+
+src_install() {
+	scons --cache-disable DESTDIR="${D}" PREFIX=/usr install \
+	|| die "scons install failed"
+	dodoc AUTHORS INSTALL 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."
+}