app-text/bibus: Drop OO frmo deps, #471282

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 19 insertions, 17 deletions

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index 77386c086123..90a414aa7632 100644
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/bibus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.34 2013/01/17 16:01:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.35 2013/05/27 06:33:30 jlec Exp $
+
+  27 May 2013; Justin Lecher <jlec@gentoo.org> bibus-1.5.1.ebuild,
+  bibus-1.5.2.ebuild, metadata.xml:
+  Drop OO frmo deps, #471282
 
   17 Jan 2013; Michał Górny <mgorny@gentoo.org> bibus-1.5.1.ebuild,
   bibus-1.5.2.ebuild:
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index c8df51b0b51e..fd36393eafee 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX bibus-1.5.0-install.patch 13663 SHA256 70bf0ba4e2f29c40bfdaefcb8c8d0a10bc592b9e08a8dbf14c6a25b342b84edb SHA512 29fb2459c8fa77b91ee874c384241cf3c123c123fccaf3dd959ec72f87dffbcf45e6e1daf3d0cd924697f4d4e33addb9af0faf3c0544faa62c4360a9b1a7ae5f WHIRLPOOL 5b76d50777985104493899fef6cadf448ab728b159f8a688bbeeb0fc05d051000ac15d3be0caa6a19c4702a06f60d40339eef15963f6563363571d57c46a1286
 AUX bibus-1.5.0-pysqlite.patch 907 SHA256 ad6a8b13087d6a70f5e4f9f220ee14274eab94d422c4a1c3ede5527fa02c45ba SHA512 ad8b224952648504a0431f43ed837ec123340bf459b33efdd8ee642a1065d47bc53ed64bec5348e6e75422d05956d091bbe0abc13482caff6be766bed7ea234d WHIRLPOOL d03a858cbad671e05675f1cc625c6e12dcf1a63b545083ef3f7284ef2cde6501f6acfed3eb9f79b35c6c6022f3c66ccdc68e639e0c71e0592ce41736fcdad405
 AUX bibus-1.5.2-install.patch 5630 SHA256 33d29b68cc89d8023011aa15d544769c832ba280eca98478c68159d41778f72f SHA512 a553cd687d0bd861b65896acb2cface6f8950e3a6006975ae53108d5984ead2e9dde8e610e003b5c8888bd0b7e635542a83c1a502df09cb6a7dcb85b8a0a1e33 WHIRLPOOL 1d0ecbdf8ac74f8f9c1e27f3d6e11f5fe71b5436922c457621a49ef8088d6597fa796e3c9a9f7d7dc4b17eaf584c20014a58128ac8f1eef835678f1ea9c3da1c
 DIST bibus-1.5.1.tar.gz 4989431 SHA256 1e6e6895124d2ab4147be83f2f87d0b1e78b2786f27345b3d1a3976d13d4c70d SHA512 9181dcc332ea139f31c44c10d084581c2d12ce2333c263eede30f2800e155cdaf0d649a6747cf30d7a259ef172d5370a351c5d747200ae7e5dfe88606f95089c WHIRLPOOL 65d9448b6d3e0ec38932b76d3e7c73ef696b9e00733b65810a1d8f789878e4c0a06378dc00b8e1c881c71c64270b44d50b97370129745dcfcf45a1bdc5b1e175
 DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
-EBUILD bibus-1.5.1.ebuild 1954 SHA256 27439d94b4c677d0313b0293e3c75443483cc900a23cd9c7a0432108c113d5f4 SHA512 f27657fd4d598e2a660cd1c3419763b9fd9632b8a7adc87c88ee7c59ffdd127be5459df4fc08589939b505ee8c82df7b382b244033f7e15e6585be2d8611d69c WHIRLPOOL 5030efb46e15d4b70ca98cfbefdaa3ed7243209759b86666576f38fd7e931eafd1cf6e535fae256599fe3b112654c1418058bbd20246a764e8d8bc69d3ccc2d7
-EBUILD bibus-1.5.2.ebuild 2070 SHA256 857fdec15886d8a020caf2bc6d153f50cd58166bfeb4dccb6c9c2ba501057676 SHA512 a18837953fb94233012801df1e863a62dbb2baa260e2a842065ea812282f28e327219f250b7b5a904b4b5c7cfef8cdbc137a9a175c696f9ca19c67798e39fe06 WHIRLPOOL f13c5e68425a5766481e0fbaf0c503b0b2b93b05ff1afa4cc2833f688dfb1cb096538988cfb796e5b69c59540774e9ebac748732107ea52cd8b995d64caeee65
-MISC ChangeLog 5756 SHA256 1b4d0dc9a4929f6c7cc9b3d33f16c3c45f4627ffa1fbf26b66e082c2b557ffc7 SHA512 bab092ad98982ebbf2a10da2a19459fa6fa4a521f8c567ac3d32e7da886373ab5b934b64315c627dfbf50e7e41b033c4262590311e5e658817aae72f16800d82 WHIRLPOOL 08f8f6023beb51299dda060a629a3fe19059805d251f2669153fb66388292ba83f6b9246e43dfbbaaadba56cb9c00150bec420b74d76abd9aff03203fce0e156
-MISC metadata.xml 157 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac SHA512 511d9e615c29eefcdd18c299ec142f8d535aeeaa54da8df92d2c723e30c27a5ac532f369f51b008005ceef5c0c6616e2754587691fa1f1e42fa718d33ae8c756 WHIRLPOOL 8cf276bea6d6211d791b31f8f9f056976f11d6e6b05ed43e097d25692a30b4967d4ed490658ae14d3384c8e6ace0f648f0285a535155888e0e029d939d5f7aa2
+EBUILD bibus-1.5.1.ebuild 1923 SHA256 6852b124f02bb2c1700750dfa85b0df4c6fa480d07132d27dfeb2bc634469bcb SHA512 b706f9d011683439c7fd6f78a936b84f234a9ba5b51800731f49acbcb6ed6ffad0c6f31f1fad2bd401f871e68efd5e894e0da13c3dd06fbae30f91f70b2522ec WHIRLPOOL 2f8b116253b0f8fa6378da8823d349947aeab2d2046fc7625405870d6d4d641e04035a45c89270e4d5b5f613564814ed97c73e304c240d7f905e7c7f31f480ae
+EBUILD bibus-1.5.2.ebuild 2039 SHA256 cd6db0028359022dbd27c2f7f5d6d65ad9f22a3fce01d0b028dfd468013996a4 SHA512 0a7c2f2b5f43ecec54f88b64da78c460a3f3919c04a0b531c08362470b642000be3a2a066fcfd5c775175f19ecab70e8f0a27f27d6e85893949470f28431b901 WHIRLPOOL ad7d963e419e15fc846342e4ebba3fe1ec514ad639ebed09b2b98dbd0826c68b9e3cbc8616bdf71c871f8ed1675aebb103307bc7cdb249d0c2e9e37e4df9e807
+MISC ChangeLog 5887 SHA256 cb7de83e0acbf7b2430890be2b9b7dc8f845b6a36fb74964bf2c18d3c5af5baf SHA512 cea7c64a6dc20e5d2664879078816531dd89133a368730b96aae6132fa8e798d0c9edf6d730bdcecbdb1372c8eab88de187d58726d89d8d59bad670523b0a1d7 WHIRLPOOL 84333c0cd51f8a09f4c05f5b807dd665ab8273240543faaeacb4d3d49ad741c1602ac5cb2304446b686ebb5e7498a70917daf25f96c6a91bd87deefdb17ec708
+MISC metadata.xml 158 SHA256 dae7918daac89b300804812d32584889aa1c4e8b9edeced06006900494457a6d SHA512 e4901a5df84502b46aa85ec01804ce680332cebe6148e4a9c8201a38935ee0d4a753bcdb3f18765b06019926a05bf099c0ed61395aa98211610ab7fdb8d7f895 WHIRLPOOL 2f12466ef66cc7b89ec428cd4b498b20f12ca6dbb219f180ac12985dfc4195882ea95809797828a720fe69a0e560d12de9c271f8aacaa06fba09c9c1ccd589e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iJwEAQEIAAYFAlD4IHIACgkQfXuS5UK5QB1E8gQAivmIzjxlHVn1Niw+YtRoK+et
-7gbEkrIVL0XYMwFOPc6sPMQNX6hwAPkbzSpwhI+/utWAegFrVKGTLN159113LssI
-RzmsXwjBvRAAgnviA4rikyIlTrG04UPJ7OpZYKdgcNFQ7R42+Gg3WrwPPb3w4mDS
-xPyjAt1IOedNXWj/33k=
-=2/6m
+iEYEAREKAAYFAlGi/jcACgkQgAnW8HDreRavqQCgrji2dBcdnUce+vrEiNj+7oT1
+NosAoIl+IQzTgqeIPYF8rbONY+r2urBw
+=1Z25
 -----END PGP SIGNATURE-----
diff --git a/app-text/bibus/bibus-1.5.1.ebuild b/app-text/bibus/bibus-1.5.1.ebuild
index ee5f7acaff89..63186bc1dfe1 100644
--- a/app-text/bibus/bibus-1.5.1.ebuild
+++ b/app-text/bibus/bibus-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild,v 1.10 2013/01/17 16:01:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.1.ebuild,v 1.11 2013/05/27 06:33:30 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -22,7 +22,7 @@ IUSE="mysql"
 # Cannot depend on virtual/ooo
 # bibus fails to start with app-office/openoffice-bin (bug #288232).
 RDEPEND="
-	|| ( app-office/libreoffice app-office/openoffice )
+	app-office/libreoffice
 	=dev-python/wxpython-2.8*
 	dev-db/sqliteodbc
 	dev-db/unixODBC
diff --git a/app-text/bibus/bibus-1.5.2.ebuild b/app-text/bibus/bibus-1.5.2.ebuild
index 0ac42ae24081..e1d7b807503c 100644
--- a/app-text/bibus/bibus-1.5.2.ebuild
+++ b/app-text/bibus/bibus-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.2.ebuild,v 1.2 2013/01/17 16:01:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.2.ebuild,v 1.3 2013/05/27 06:33:30 jlec Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ IUSE="mysql"
 # Cannot depend on virtual/ooo
 # bibus fails to start with app-office/openoffice-bin (bug #288232).
 RDEPEND="
-	|| ( app-office/libreoffice app-office/openoffice )
+	app-office/libreoffice
 	=dev-python/wxpython-2.8*
 	dev-db/sqliteodbc
 	dev-db/unixODBC
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
index d369d068ffb8..897aa2e6b59a 100644
--- a/app-text/bibus/metadata.xml
+++ b/app-text/bibus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+  <herd>sci</herd>
 </pkgmetadata>