drop old; fix unresolved symbol, missing -lm, bug 527828, thanks Fat-Zer

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

5 files changed, 35 insertions, 62 deletions

diff --git a/sci-electronics/oregano/ChangeLog b/sci-electronics/oregano/ChangeLog
index c1180db64e36..98f503ce3a26 100644
--- a/sci-electronics/oregano/ChangeLog
+++ b/sci-electronics/oregano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/oregano
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.58 2014/08/10 20:28:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.59 2014/11/12 21:46:23 dlan Exp $
+
+  12 Nov 2014; Yixun Lan <dlan@gentoo.org> -oregano-0.69.1.ebuild,
+  oregano-0.69.1-r1.ebuild, +files/oregano-0.69.1-fix-libm.patch:
+  drop old; fix unresolved symbol, missing -lm, bug 527828, thanks Fat-Zer
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> oregano-0.69.1-r1.ebuild,
   oregano-0.69.1.ebuild, oregano-0.82.ebuild:
diff --git a/sci-electronics/oregano/Manifest b/sci-electronics/oregano/Manifest
index dcc3939a8c7c..bae000d2b01c 100644
--- a/sci-electronics/oregano/Manifest
+++ b/sci-electronics/oregano/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX oregano-0.69.1-desktop_file_update.patch 962 SHA256 7cbe2a11d5f9a62b6a488cd0069c639b6d51f58ad136b20e2ad23b403ba52c92 SHA512 0e15a3f6ef43bca0101195bec9484cfcd54c4b1d067fc0e89eac1a97f1b25f00de7b3e9143e060c911a4d1cae8f2cf6683dfad89f60f4e867e2834d76c2a2031 WHIRLPOOL 8acb0fdaa9cc4fdd2ab84ad3debea4e9cb077afa64df41468da0ab2179eb5a58df3471fba7459d8c3703c781ffe1a392a4c0a256c1143e00ba2cad9d9ebbba31
+AUX oregano-0.69.1-fix-libm.patch 366 SHA256 78f5cd760d27a5d057694431937eb10080076915b19ed88cc291ba2ee1435064 SHA512 647499541abcdb04b4a0e3ddbc14efde217d6f4661c3e838d08cdee318cf252dc753cba436729ba513b3ad13406bebd923792f071739960be7ba3fe55147064a WHIRLPOOL b2754cbb8d83d9b79e9cc2c26365f21928743398bd50fbe0ca0154f95ebd50484910f0b1525e31e2e9a08d77cf80b511026f657ed7aaeaf6c2d2b0e1a49c4606
 AUX oregano-0.69.1-scons_env_flags.patch 943 SHA256 8b5a450daece05ea83430c48d96f9b28107f99a8d90741ca835a0ff3bbfa5769 SHA512 518979136acee486559300ec2540f0934251f9753c10fe4937fe57ddd7566339f1747df624db23d329184f8e3baff67913a9d207eed1ac587c195cdc3ab4eba6 WHIRLPOOL 06f00590984bf8a7ba83b2d9756a5783c0d193d66574351465f3efd6ec9adb3d04fe57f7ea623a757a280f87134ab9f4749a93a2b400ad06c24eead556f37bb6
 AUX oregano-0.82-asneeded.patch 479 SHA256 df3e0979b6256a57bb7eee65438e73eb19ebfeb5bba41d98c5366e48887d6d74 SHA512 addcf0076df2a8b01d08ac3e93177377d0b249ca2074725fd29eaad5aa2f99436ad7c788257fd34e678a8063fdfc871e2d6efe546977f94cbcba748099647261 WHIRLPOOL fc4c68a911eb38e42d295b31056f3907883437d7a86a3719016f8bfac3252d0a8ee3c87f55b05d4927c80f5caaaecdf2fafec522dcf51b49547d4c02e6627936
 AUX oregano-0.82-automake.patch 810 SHA256 3847508cf9ffeb63e2ce236da09b27235a6bb30501c390b8479311ec38a80dcc SHA512 cd0e1701dca8e87964d3609e034224b9a0c0b7a4ceb8988a4d8e62d0206f4b16cd91138451be6e2fbd97dcb08537b232c107b1746902831d9cad897c890ebc7e WHIRLPOOL a97d0fcb33427758a06a41e2ad61e3d6ef179a82bb69f31eca73da064bcf98bd17d047b75218890663f147ff2b09bdfb39c4fb5f409c893621b7be37c59b8c48
@@ -9,15 +10,24 @@ AUX oregano-0.82-format-security.patch 1002 SHA256 af63e4daf53f8231d7c10fa78d966
 AUX oregano-0.82-remove.unneeded.docs.patch 209 SHA256 980997d1a59eefa1a58a587675615e2fa57a012dcd44f8f238c09e2924a11f14 SHA512 ba8526dd5e626af65c16bcf0ac342ddcfee309e2580242f766129448d376e0969a2ddf0c960c626bd214dd36881bfe305993d3abc0c42009fcfd9e4a5e1af319 WHIRLPOOL ba52dbbd0653075caa21f816f9c26a372dd9e5d94fc8188eeaa0ff1f7ee43161da115ac9179bce5a6bd90a3028da5c4437e0c5d37bd088fae1a7a53a5e0ddc48
 DIST oregano-0.82.tar.gz 1398390 SHA256 b68cdd0c80421b0571bf520d3f8b0d1793808fee1ac7ac28dcf8ebaff2cb1a2d SHA512 9c03f079e81f8de7d9e8880a890059bd8034e82bf47566ba3905943ccedc7a1642517fa2f6fcb2a2d10228c0bf79da055c1ed9bf3e07e505819641cd7cbf168c WHIRLPOOL 668ed4f056fc0d39a789bfcb67d80375738f54951127cd3007b3b8261a370a41b758728d97d40b4fb773f131636e20f0e721ddb6a0f3e0d640e6d344ef102010
 DIST oregano_0.69.1.orig.tar.gz 673785 SHA256 ec96f6d113c642aa423d4abf9d667802bc3754eda8a9f4e287b8b9cefbb4b589 SHA512 4dc12f90c70ef5ff5011cfc29f3c53e7ea4c77c3b38815919ebdf90fbcf3b157d4dc7327d62c190945f7c191f4584931a02dda50ae966aa59d6da5098e8ca5e2 WHIRLPOOL c1c78fdf1f5a26417d0272157301952f944c7552bc72fb2c7982ef454b4f4096f432950fc63fb78baeb0c686d0c3edbd036dc0ce1bc93c4f9af3c09f5c2889e1
-EBUILD oregano-0.69.1-r1.ebuild 1653 SHA256 92c47fc74a2a257cabfe22db925e4a710badd37aeb3517d2ec5ea9dcb387baf5 SHA512 00f1f828eb8093383778bf97ffe38b648e3e2eedf2ab9356a43ab17fca3b0cda8e6a9d6b9b01d47e3416f01f7f144c1ef819ecb2e0e918b32b54c01da0b34159 WHIRLPOOL 505811a814b7c7598e9e726ddc117fac504ee07f86b1887030a8903fd4764b699e48c7e01ddc36ad30916f5685bcafecc66adc0af15159b79f1668689b22d2a4
-EBUILD oregano-0.69.1.ebuild 1416 SHA256 df6a403b71dd82091ecda23a237c468968f297e6a2ceadedd7a960ca217ed468 SHA512 dc8415a4751a4eeed5babee29f0b96e822a0562540ced9ce3c3fa21cc5cb63e4ea458ed7f58f740e701ffe1afdbcbe721ef07c6e919b88615cd2995a60f8ba7b WHIRLPOOL 606130a7d5adc24e5afaa5d9a42768a316f4bbb40c6fee86a17281a869117e579635e7237a30247efefd2600637451bac6dc7bfe60dc9e6715a075535d7af1db
+EBUILD oregano-0.69.1-r1.ebuild 1693 SHA256 e76785cb8c6b4b5d8662fdcaf29e9259202877b3ae5ea773280f7807983d62b5 SHA512 76f19b20131756a602031443fb1f7f7305f95066d608dbf97cd2e5de8fbcf5d93471575fcba2257f3d0107f2da7bcdcf8327c3bfac5379546e34ebf9b4cb7a5f WHIRLPOOL 85cd99255fe5eda03b4a685ec854a5941557ce7af7222ae89e4663775df12eae14a10ad6af19f760afdb9b52406df763a3248bb46a903142dab16e7cf2bd37ec
 EBUILD oregano-0.82.ebuild 1930 SHA256 e87d0e97a4e0a80f203a80f5f8a2c68a3889ac8e83857f908b127ec8ee858f4c SHA512 f68b4b52448dcdfc2729a604197df41f27d92a837f204f02ecc3aa8d7f5f330ba40ad5ae65769ea4622287887d9f99c2c33d50ebda74d0a1b72fd5cce7ec1caa WHIRLPOOL 8bc9298c58867f25be35d097e35578e37cb781c5e4b49a0b384ee070096a8f5a684742ca89f197219795dbb9bee7777e5ac7a0da4f99bfe259a402ab6d17af25
-MISC ChangeLog 10034 SHA256 61855d913edf3b1c7595e131348b02b50c4156cab58b8ea7394759f3f42bbc81 SHA512 a9e681b0ea664328e6685c15e14ea568c8f028c792a0c1d4a7655695009f4f461ea415e874b06957240e01c5c95d95bec6dff41deda27c998b659d68d3254193 WHIRLPOOL 28f59238dcca4b6b4f3d3b55a1ac8868eb653637716497f335fce6bb62cd2201d9060f94168582ae4b23cafd55c112460b350d13bdeeb590c99c6f81cdff2322
+MISC ChangeLog 10241 SHA256 04683ec9689e5ce08a34fd62e4248fb5ed293980147729b83b114080cf207a0a SHA512 46933b7b82f2ad400c9b826a5de188b6ddab0744458acf6a57d3f18561736a0a41431e08b2026d7a72a92a1ff087c0c61a0ee36b3fc2b19d26815a1381f4a667 WHIRLPOOL 944deae12aaffa0c59ed1b174321ff78dc213be33f827d02f4e1bf0b52c9e81c27c98324c8584bc01212a03a82a87350bf2a194a3a77796b5fe35b3349b9d033
 MISC metadata.xml 396 SHA256 f4b0c09bb67ede05a065279a794b16ff245252fc8faf07c28d928294347f0c87 SHA512 4293dd068b32cbc0850ee53a8d806e1c3226611243e1a3d5326e371d26c0720490f2718f9356dff8abc1f3d4635d152710116f6a392e477c18af0c9512e67119 WHIRLPOOL ea41e175b3c4ddde0cf267470e276d9cf5861c0de08012505de5345690d4d1fabbd3aa403056d45fd0bd3137caa8e7747e9382a632569cfb7b055e3999b5dd47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn1fIACgkQcaHudmEf86qUrACghbo8qChFILJ++QRXwmRyFA4P
-T3IAn3XfyxV4wnkOmjGangcKNrVp5dHB
-=kPE1
+iQIcBAEBCAAGBQJUY9U4AAoJEJIMDbyqvv1VbsgP/Rhu5dkWAdfSasxrlr8wTIin
+drxr0R6vDnuuLCodA91m5I6v5b3jYAcI70R5+dQh/6AuIvpx0TCPuLfs7tHCqVIn
+HWDSpIccKpp4pVf5SXSg77XOFEtqHVGHVdYZI3A2yRrM3q5uzudHu0dN59LCjdl+
+gpayPfpC68HVOZ2vvjEbT9ZMgTTdy2Q0WghmFOM19QDro6RIJFkHw5etzidbRQO1
+3pVbVlTdnfaNy5MKuwTWirW2J4dO/pn1DIDdnI1do+CYTneGzYEV6M0NbDzY3+yb
+roBQTOr1I3gJO14mbJ2GDx9EHiewnlq5zBPJ2mNX9ex99iRChzNWvDdHU2bMvIQS
+AlerhToHXVMYOtxMp6wDdKWcfny9lrWEOj+Ydgt47W/lA+hleydtxdkodhBthx5X
+ZUr2U2VBiqAp7HxWfBwPKoxPWdcZ6S30vcJRBIyd1b8+FJeG5doimb6li71auLXe
+t15GNiQEO8LKGOwBF7ShM+8hR5/W8Diu0XpQkKe74Oi3Wlnzppwdhi66rV6QSovH
+zyYaONV0FrNcspvMfl+wwATfwzls7VqqQwzPxi8b04/qs/K6je+sjYlPsn5gEA9I
+fiwXqTOD+iHc+XsV2Jown2aWl+iDIHEg7ZQIzTTjxO/Otiv6C88Et6IUsJidoXwR
+QFcNN5xhq+oGIwfPm0CS
+=prsY
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch b/sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch
new file mode 100644
index 000000000000..420ffe17f00c
--- /dev/null
+++ b/sci-electronics/oregano/files/oregano-0.69.1-fix-libm.patch
@@ -0,0 +1,11 @@
+--- src/SConscript.old  2009-07-07 19:49:49.000000000 +0400

++++ src/SConscript      2014-11-12 20:57:50.311089881 +0300

+@@ -67,6 +67,8 @@

+

+ SrcEnv.Append (CCFLAGS = Split ("-I./src -I./src/model -I./src/sheet -I./src/gplot -I./data/dialogs -I./src/engines"))

+

++SrcEnv.Append (LIBS = ['m'])

++

+ oregano = SrcEnv.Program ('oregano', files)

+

+ # Install alias #
\ No newline at end of file
diff --git a/sci-electronics/oregano/oregano-0.69.1-r1.ebuild b/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
index 356bc77f79e4..5506d29f0117 100644
--- a/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
+++ b/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.8 2014/08/10 20:28:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.69.1-r1.ebuild,v 1.9 2014/11/12 21:46:23 dlan Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils fdo-mime flag-o-matic scons-utils
 
@@ -33,6 +33,7 @@ src_prepare() {
 	# patches from debian
 	epatch "${FILESDIR}/${P}-desktop_file_update.patch"
 	epatch "${FILESDIR}/${P}-scons_env_flags.patch"
+	epatch "${FILESDIR}/${P}-fix-libm.patch"
 }
 
 src_compile() {
diff --git a/sci-electronics/oregano/oregano-0.69.1.ebuild b/sci-electronics/oregano/oregano-0.69.1.ebuild
deleted file mode 100644
index dc8cdd548cac..000000000000
--- a/sci-electronics/oregano/oregano-0.69.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 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.9 2014/08/10 20:28:33 slyfox 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 ~x86"
-LICENSE="GPL-2"
-IUSE=""
-
-CDEPEND="
-	dev-libs/libxml2:2
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.12
-	>=gnome-base/libgnomecanvas-2.12
-	>=x11-libs/cairo-1.2
-	x11-libs/gtksourceview:2.0"
-DEPEND="${CDEPEND}
-	>=dev-util/scons-0.96.1
-	virtual/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
-}
-
-src_install() {
-	escons --cache-disable PREFIX=/usr DESTDIR="${D}" RunUpdateMimeDatabase=no \
-		install
-	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, ngspice or gnucap for simulation"
-	elog "to work."
-}