Fix multiple inheritance.

Package-Manager: portage-2.1.2_rc4-r3

3 files changed, 14 insertions, 22 deletions

diff --git a/dev-libs/liboil/ChangeLog b/dev-libs/liboil/ChangeLog
index 1dc6c5367428..de05a6541b5f 100644
--- a/dev-libs/liboil/ChangeLog
+++ b/dev-libs/liboil/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/liboil
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.37 2006/12/21 14:04:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/ChangeLog,v 1.38 2006/12/31 22:55:24 dirtyepic Exp $
+
+  31 Dec 2006; Ryan Hill <dirtyepic@gentoo.org> liboil-0.3.10-r1.ebuild:
+  Fix multiple inheritance.
 
   21 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   liboil-0.3.10-r1.ebuild:
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 99f43458f879..20ace1333694 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX liboil-0.3.10-sse2revert.diff 508 RMD160 aa6cfa6c8600d655893169ae7bc3705bdda6f0c3 SHA1 f7aa38adcbbd24b340a38a071caa522915dc9e63 SHA256 94ca438c25fe1130d621eee9c6f8e0bf883d6114eff643f11b64e2a452f55527
 MD5 e7ac78a934eb833b69da689332d40d8b files/liboil-0.3.10-sse2revert.diff 508
 RMD160 aa6cfa6c8600d655893169ae7bc3705bdda6f0c3 files/liboil-0.3.10-sse2revert.diff 508
@@ -13,10 +10,10 @@ DIST liboil-0.3.10.tar.gz 860303 RMD160 585413d5955b08b24cec18f588927ac071a44098
 DIST liboil-0.3.6.tar.gz 714947 RMD160 f86830c0c9101e8fbe22879f930fb61d23b0139a SHA1 43cfdfeace05006bfeaacc30f1feeece657595a2 SHA256 52cb40905064ef836527b01c86650bebf662e1224da43c6fb0f3e1f443de232c
 DIST liboil-0.3.7.tar.gz 822820 RMD160 9e4138116e331f24de1e27ba933ed7b541f7592e SHA1 ff0e5e876878979b80f9da6d818264fdc3420ab9 SHA256 626e860df789c89285b7a891e0ac8d9da16786ff2453a59db5f60383c78c5e17
 DIST liboil-0.3.8.tar.gz 834167 RMD160 c8fe0c1d28429f69818b1ca689082b1849aa595d SHA1 ed6002cf02fbe9d248c3129578cbf6d24ebe3072 SHA256 40fa52503e30c21fd1ae1affcc038ff05af5caf0c77c27630526069ffad804ff
-EBUILD liboil-0.3.10-r1.ebuild 977 RMD160 034df846f65acadae51d353472a113229b428997 SHA1 619ab9ce3f2118749223fc378abcb8ad2613c77f SHA256 0b04ff718071158557d45a71fe832613d1580e494fbd66710edacdcd84d4bc80
-MD5 0385c9e7f99d86fd248bb62f721303ad liboil-0.3.10-r1.ebuild 977
-RMD160 034df846f65acadae51d353472a113229b428997 liboil-0.3.10-r1.ebuild 977
-SHA256 0b04ff718071158557d45a71fe832613d1580e494fbd66710edacdcd84d4bc80 liboil-0.3.10-r1.ebuild 977
+EBUILD liboil-0.3.10-r1.ebuild 970 RMD160 e19587b00abfc17034e4323c6f1afd7f95ce0501 SHA1 c3743dc9fb2fdc138cdd357645ae377d79d1479d SHA256 e73badab1a8d0939ee6e310b49237d4470e3bf39c5814408892017bd2a829175
+MD5 363becbe073579f022d2765cd0699c66 liboil-0.3.10-r1.ebuild 970
+RMD160 e19587b00abfc17034e4323c6f1afd7f95ce0501 liboil-0.3.10-r1.ebuild 970
+SHA256 e73badab1a8d0939ee6e310b49237d4470e3bf39c5814408892017bd2a829175 liboil-0.3.10-r1.ebuild 970
 EBUILD liboil-0.3.10.ebuild 760 RMD160 563668b2eede1ff55a85fb23525c2353ee6fb22c SHA1 b5d7e21402d5ca98c8e83caa4998ce50872f16d4 SHA256 8e2d1de8da40f37d10e1d7bd916a337a8a14ad3cf11d5755188bdeac6b6bf827
 MD5 ae9d97285d068771fb97e2109593cbca liboil-0.3.10.ebuild 760
 RMD160 563668b2eede1ff55a85fb23525c2353ee6fb22c liboil-0.3.10.ebuild 760
@@ -33,10 +30,10 @@ EBUILD liboil-0.3.8-r1.ebuild 775 RMD160 0be441e51702dc2706a550da719b21745b87ee8
 MD5 890679c6c378d87400c0a728aa687a0e liboil-0.3.8-r1.ebuild 775
 RMD160 0be441e51702dc2706a550da719b21745b87ee8b liboil-0.3.8-r1.ebuild 775
 SHA256 8c8f6e6a4dca805762268040b0791a84f6a7b958e32706d5da00794915b3dd42 liboil-0.3.8-r1.ebuild 775
-MISC ChangeLog 5010 RMD160 e558b5d77b8c7182dcdac9026c717a671685dc4c SHA1 fef49520c23dd8580eb40d0f8f7ff0fc1bbba3b9 SHA256 d556adf5d64047c99e29ad98f4d24b66ef11ec724eb6237d98d5f12c12cd1b84
-MD5 edf8085d3520eac595c6e6541c55b67c ChangeLog 5010
-RMD160 e558b5d77b8c7182dcdac9026c717a671685dc4c ChangeLog 5010
-SHA256 d556adf5d64047c99e29ad98f4d24b66ef11ec724eb6237d98d5f12c12cd1b84 ChangeLog 5010
+MISC ChangeLog 5113 RMD160 d0ef92896999797c6123989707a365b67ca02859 SHA1 db36575ea9b5b3d754a5b03212bfae1be1ce1bbc SHA256 d57beb2bb87ff490171ecec5bb0a1d624541c7156013b26e28ca3e856e72e697
+MD5 57f1f4748fb3c0272b6e7273db03322f ChangeLog 5113
+RMD160 d0ef92896999797c6123989707a365b67ca02859 ChangeLog 5113
+SHA256 d57beb2bb87ff490171ecec5bb0a1d624541c7156013b26e28ca3e856e72e697 ChangeLog 5113
 MISC metadata.xml 227 RMD160 dbceeac4d1cf10216fdce2b2c00e09aeb11e2f21 SHA1 d7b19f237d56d40a8d32832fb820522243581a4e SHA256 eab0bc4908cd44a7660393848ead1a4866b1cd852557cd6963333d0f96a0b4af
 MD5 8ba6cdb61efe475b67332297443a7999 metadata.xml 227
 RMD160 dbceeac4d1cf10216fdce2b2c00e09aeb11e2f21 metadata.xml 227
@@ -56,10 +53,3 @@ SHA256 ccd7a6f5ab3b1f85e11744436d82bb912c54fbf13260ef70b63d2f6aaf5caa58 files/di
 MD5 b2101ecb415b2ef9eefc246ca0fd746d files/digest-liboil-0.3.8-r1 238
 RMD160 881f64f503c0b215fe6adfda940f0d4497d97633 files/digest-liboil-0.3.8-r1 238
 SHA256 228afa57663975706dd7dc9b83dff888a12b3fa1953d9834e55598e5a45b77ed files/digest-liboil-0.3.8-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFFipScKRy60XGEcJIRAsOyAKCcQ+J0biNSa5RRwiYTvRyGtlC3bQCeMOkQ
-jIjGys4wYALwD6pBeBAjkZ8=
-=6Vd2
------END PGP SIGNATURE-----
diff --git a/dev-libs/liboil/liboil-0.3.10-r1.ebuild b/dev-libs/liboil/liboil-0.3.10-r1.ebuild
index 3523cfbab924..cd6c51304a56 100644
--- a/dev-libs/liboil/liboil-0.3.10-r1.ebuild
+++ b/dev-libs/liboil/liboil-0.3.10-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.10-r1.ebuild,v 1.2 2006/12/21 14:04:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liboil/liboil-0.3.10-r1.ebuild,v 1.3 2006/12/31 22:55:24 dirtyepic Exp $
 
-inherit flag-o-matic
-inherit autotools
+inherit flag-o-matic autotools
 
 DESCRIPTION="library of simple functions that are optimized for various CPUs"
 HOMEPAGE="http://www.schleef.org/liboil/"