Fix --as-needed problem (bug #424966). Regenerate glib schemas

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 55 insertions, 18 deletions

diff --git a/sci-electronics/oregano/ChangeLog b/sci-electronics/oregano/ChangeLog
index 2a663bda9add..e955ba9a3449 100644
--- a/sci-electronics/oregano/ChangeLog
+++ b/sci-electronics/oregano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/oregano
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.53 2012/07/05 08:16:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.54 2012/12/06 18:40:58 tomjbe Exp $
+
+  06 Dec 2012; Thomas Beierlein <tomjbe@gentoo.org> oregano-0.82.ebuild,
+  +files/oregano-0.82-asneeded.patch:
+  Fix --as-needed problem (bug #424966). Regenerate glib schemas
 
 *oregano-0.82 (05 Jul 2012)
 
diff --git a/sci-electronics/oregano/Manifest b/sci-electronics/oregano/Manifest
index 789d3fae0a75..935368f2efc2 100644
--- a/sci-electronics/oregano/Manifest
+++ b/sci-electronics/oregano/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
-AUX oregano-0.82-format-security.patch 1002 RMD160 4ef1142daf8a359dbf97913674fa6391816a387a SHA1 f5e8cf3b490418769996e1cda00f10d75999913b SHA256 af63e4daf53f8231d7c10fa78d9669033c257e540c105b4d5b32e0e655839b06
-AUX oregano-0.82-remove.unneeded.docs.patch 209 RMD160 905764f90676f2544cafc0a245a56635bb69dc29 SHA1 0c6a0e6d876c210fd2daaabbdd69a1ccc91a53a5 SHA256 980997d1a59eefa1a58a587675615e2fa57a012dcd44f8f238c09e2924a11f14
-DIST oregano-0.82.tar.gz 1398390 RMD160 4b68fe79161e0b5034cd401eddec52c1478653de SHA1 bf73455649c73ca673727f7d1b5b15a832575e1e SHA256 b68cdd0c80421b0571bf520d3f8b0d1793808fee1ac7ac28dcf8ebaff2cb1a2d
-DIST oregano_0.69.1.orig.tar.gz 673785 RMD160 30a2c3940ffc6a96d4b0abcaa2257390e48a2bbe SHA1 3cc270717cf1d3c1954cfc83350a3a14d98c4f26 SHA256 ec96f6d113c642aa423d4abf9d667802bc3754eda8a9f4e287b8b9cefbb4b589
-EBUILD oregano-0.69.1-r1.ebuild 1654 RMD160 54a049b64d9904d58cf72e4696b568a1a1c0de81 SHA1 d1d83aa8f64efb1699b4058afb28e720d1f7d08a SHA256 2d67c4bbdc3e9c1d96677673e343799791fe581c4e7c3bf92f6eab912a12b18c
-EBUILD oregano-0.69.1.ebuild 1417 RMD160 b33c3b0a8e6e5b307a93b8daea3f84d1a6e55eba SHA1 3decba2f84c907f7f5d550c43b6c5ba0284675c5 SHA256 3e3e68688ce33cca845af15dc567495e16f61be1612b33deb5ca415eb4a268e7
-EBUILD oregano-0.82.ebuild 1328 RMD160 1059add25c17497f376c77df43c3d94ea4c700f8 SHA1 790876bc8bed22f451e09e0163980441cee739a8 SHA256 c2bd16d9fe4d7b6ac78e4b1e7f202b17464397ff52dbd921ef2fd722d79c2b77
-MISC ChangeLog 9224 RMD160 aaf6f90fb58b848a18c69d7fca6d1ae6052f46aa SHA1 d40667ab8a3b1b070bf7a71043af0a3da607dff2 SHA256 92ba0c4d7a065673d9f5e3c6f322f976873fbd3ee83340dce71cee5d5dff56c1
-MISC metadata.xml 396 RMD160 a3b0d0c614542c4ab5226db80ce0d0425cba5894 SHA1 8c34d29a034de1295e18b38b2da543089eca8a1e SHA256 f4b0c09bb67ede05a065279a794b16ff245252fc8faf07c28d928294347f0c87
+AUX oregano-0.69.1-desktop_file_update.patch 962 SHA256 7cbe2a11d5f9a62b6a488cd0069c639b6d51f58ad136b20e2ad23b403ba52c92 SHA512 0e15a3f6ef43bca0101195bec9484cfcd54c4b1d067fc0e89eac1a97f1b25f00de7b3e9143e060c911a4d1cae8f2cf6683dfad89f60f4e867e2834d76c2a2031 WHIRLPOOL 8acb0fdaa9cc4fdd2ab84ad3debea4e9cb077afa64df41468da0ab2179eb5a58df3471fba7459d8c3703c781ffe1a392a4c0a256c1143e00ba2cad9d9ebbba31
+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-format-security.patch 1002 SHA256 af63e4daf53f8231d7c10fa78d9669033c257e540c105b4d5b32e0e655839b06 SHA512 426f6fb187474cd7443dce74cfa67071f51929f6c4bba1987623af10745132c38c7806243714091d895eabd1eeab2c43dfe26c23978c8d91d211f45275a6cfc3 WHIRLPOOL 31f56a75d8153d628c005652581264ca7a2cb0cb3446e19468466bea4a536d087e67e1061a60c0193cfdaef6360a7238ccb0691fe3ea9ecbc6a4f3e2483121d0
+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 1654 SHA256 2d67c4bbdc3e9c1d96677673e343799791fe581c4e7c3bf92f6eab912a12b18c SHA512 1e4515708acbf4d91535f55da61653a3b4d0cf1d484cb2e70fab1e3153235a15c7faf97778bdaef53a95fd49607fa1da9026768e633bbd8e7f1337629f7ef9a4 WHIRLPOOL 9b0de2aa9ddcc1c87779d676c8d45a44bf8d885c37093189b7528ca8c24beb9cacd83177820cf0bf22b11453997493a2e9aba722bb48571e14060b94ea3764c2
+EBUILD oregano-0.69.1.ebuild 1417 SHA256 3e3e68688ce33cca845af15dc567495e16f61be1612b33deb5ca415eb4a268e7 SHA512 65b1b46ec0505d982c5b84f6391253412bb3c55c4dbf9cc2893bbcfbd2ac5112ef10a526d083575bc663ba0d0cecfce023f8506d27c1ed039a4baf0b3524ff23 WHIRLPOOL 31eb2b92aa604e0ae918e556cec5ae3ef8e44dd3522d0012e99ac7a3719e636f32fff72344d10f69c2f197a15f7e156795c7ffda23b1656208f98d8e66545310
+EBUILD oregano-0.82.ebuild 1517 SHA256 2993687dcb76aa99b78af67eab6dcc1273d4604427a4ce3cd268314b591b6de9 SHA512 88085662d860b9ced8a787761119dcae008c63c066b7834f5f4dd261990a09d5268b449e8e551a994cbda0ef0d45960813f71ac99d83ff9cea48369a7220f509 WHIRLPOOL 8e30a829464752932fe12c1ea3d26877ae67d3d8dd5c48521b4704c4ea3e08a654a9daa730134a727e9cf60d595785cb0d7a1fa942519cd6dc78fcef51c008e0
+MISC ChangeLog 9404 SHA256 04de615502867c0af421bb19041f21322636902973c589e477d6a910d76b4962 SHA512 aa891fd3c5ee8e061b00c1b4379ad0b0d0737fb252577915c53d7213f7cb595ae86898e04571fb1f6326ede3a87a719936537de091cb5721b2eedd7ae4581a49 WHIRLPOOL 25b876bff275afc7e907510ecd87712c0e507c152c6e8076d0b26f0633795c3b883995e2ea7efc276f204c0b99ee039adce9212997cb08cd5a5fc795a89566f1
+MISC metadata.xml 396 SHA256 f4b0c09bb67ede05a065279a794b16ff245252fc8faf07c28d928294347f0c87 SHA512 4293dd068b32cbc0850ee53a8d806e1c3226611243e1a3d5326e371d26c0720490f2718f9356dff8abc1f3d4635d152710116f6a392e477c18af0c9512e67119 WHIRLPOOL ea41e175b3c4ddde0cf267470e276d9cf5861c0de08012505de5345690d4d1fabbd3aa403056d45fd0bd3137caa8e7747e9382a632569cfb7b055e3999b5dd47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/1TUQACgkQknrdDGLu8JB3lAD+I8ZHSaSL0C9VsUmmpSfjtxQE
-ZfObDBTK0THwnf1K7HIA+gKRVdkTh4+aF07hNTfG17h+PPdTG9TPkppui6CsJ0WK
-=/fkX
+iEYEAREIAAYFAlDA5sEACgkQQe4uqXYgU9XPyQCgn+5oQBCmYPoTvJ8hDvW2gWVC
+bugAoJ5MJ2lZFhRQPCllB7yrD4G0vECu
+=jcNk
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/oregano/files/oregano-0.82-asneeded.patch b/sci-electronics/oregano/files/oregano-0.82-asneeded.patch
new file mode 100644
index 000000000000..8432a918da65
--- /dev/null
+++ b/sci-electronics/oregano/files/oregano-0.82-asneeded.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.am.orig	2012-12-06 09:58:37.000000000 +0100
++++ src/Makefile.am	2012-12-06 10:00:03.000000000 +0100
+@@ -34,10 +34,11 @@
+ 
+ bin_PROGRAMS = oregano
+ 
+-OREGANO_LIBS += gplot/libgplot.a \
++NEW_OREGANO_LIBS =  gplot/libgplot.a \
+ 		engines/libengines.a \
+ 		model/libmodel.a \
+-		sheet/libsheet.a
++		sheet/libsheet.a \
++		$(OREGANO_LIBS)
+ 
+ oregano_PIXMAPS = \
+ 	plot.xpm 	\
+@@ -99,4 +100,4 @@
+ 	oregano.h
+ 
+ oregano_LDADD = \
+-	$(OREGANO_LIBS)
++	$(NEW_OREGANO_LIBS)
diff --git a/sci-electronics/oregano/oregano-0.82.ebuild b/sci-electronics/oregano/oregano-0.82.ebuild
index 9eb1239c86ee..95e4c5db05d6 100644
--- a/sci-electronics/oregano/oregano-0.82.ebuild
+++ b/sci-electronics/oregano/oregano-0.82.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.82.ebuild,v 1.1 2012/07/05 08:16:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.82.ebuild,v 1.2 2012/12/06 18:40:58 tomjbe Exp $
 
 EAPI="4"
 
-inherit autotools eutils fdo-mime vcs-snapshot
+inherit autotools eutils fdo-mime vcs-snapshot gnome2-utils
 
 DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits."
 HOMEPAGE="https://github.com/marc-lorber/oregano"
@@ -27,21 +27,31 @@ RDEPEND="${CDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-format-security.patch
 	epatch "${FILESDIR}"/${P}-remove.unneeded.docs.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 	eautoreconf
 }
 
 src_configure() {
-	econf --disable-update-mimedb
+	econf --disable-update-mimedb --disable-silent-rules
 }
 
 src_install() {
 	emake DESTDIR="${D}" oreganodocdir=/usr/share/doc/${PF} install
 }
 
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
 pkg_postinst() {
+	gnome2_schemas_update
 	fdo-mime_desktop_database_update
 	elog "You'll need to emerge your prefered simulation backend"
 	elog "such ngspice or gnucap for simulation to work."
 	elog "As an alternative generate a netlist and use sci-electronics/spice"
 	elog "from the command line for simulation."
 }
+
+pkg_postrm() {
+	gnome2_schemas_update
+}