From 44c8eb871ed21416d912c189b0c1e6aff18f1639 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Sun, 8 Feb 2015 18:33:31 +0000
Subject: [PATCH] Improve dependencies, thanks to Andreas Sturmlechner

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!
---
 dev-libs/liborcus/ChangeLog             |  6 +++-
 dev-libs/liborcus/Manifest              | 40 ++++++++++++-------------
 dev-libs/liborcus/liborcus-0.5.1.ebuild |  6 ++--
 dev-libs/liborcus/liborcus-0.7.0.ebuild |  4 +--
 dev-libs/liborcus/liborcus-9999.ebuild  |  6 ++--
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/dev-libs/liborcus/ChangeLog b/dev-libs/liborcus/ChangeLog
index 88a431092e0f..4a7e95488235 100644
--- a/dev-libs/liborcus/ChangeLog
+++ b/dev-libs/liborcus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/liborcus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.32 2015/02/04 09:37:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.33 2015/02/08 18:33:27 dilfridge Exp $
+
+  08 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org> liborcus-0.5.1.ebuild,
+  liborcus-0.7.0.ebuild, liborcus-9999.ebuild:
+  Improve dependencies, thanks to Andreas Sturmlechner
 
   04 Feb 2015; Michał Górny <mgorny@gentoo.org> liborcus-0.7.0.ebuild,
   liborcus-9999.ebuild:
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 9f75f8f31690..cef47dc1e344 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -6,27 +6,27 @@ AUX liborcus-0.5.1-mdds.patch 455 SHA256 ac1c2ffbbda229bd56c29ee2ec4a4676a71aff3
 AUX liborcus-0.5.1-oldnamespace.patch 377 SHA256 c4cf81d2e93e9ec6da2b847e73fe4aba3cec37be95315b22e5b83157ec5ac07a SHA512 8482b4f41743c2e8e175bfded6e81c8fb5ff1bb1fabfdd34795c26be002548497cef5d1b2babb3bb4e2082a702eb66798b8618820b4f01a7429b89e86b77919a WHIRLPOOL 6b165f50540dba9446488c1f6b178fa82fae888e7b3f72d66796e85021fec436a992009c285919d43ab9520d1fef0ddfe0e0c8dc47c50189afcb8fcb3bc7369d
 DIST liborcus-0.5.1.tar.bz2 1445106 SHA256 e632373149c0b29a971aa74c079f8825bc6bc7b09c0899c8de004ee7e72ad765 SHA512 ca69c89d09a514285b119d1cda67e20856ee6897ca5e33223cc5f8163a488fc367dec10a6e2a33a7b09b337dbab2c461e9dcf1b2c72bafebd6861a1eb03683d7 WHIRLPOOL 32c8f0f50b239ae164a4ac04ee79c2bee22391cf01cbb875ca92451dbf2d26f2a24db22e5f0b2ab82e2da4c5ff04663c16ceed305da145542855ec0645bf24e4
 DIST liborcus-0.7.0.tar.bz2 1665988 SHA256 7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 SHA512 63aad5154e25d7d7bfd10f07e614e4c1ed2691a31c61c2b1e7ec029fa4d9168eba5b4303f5164ab29ef92843ce8f8afa9682772515c8b5e8ae65f4561b331db8 WHIRLPOOL b555b005b41fb41571ac7dbc63e32541decd0b79d61435a6730de9438761afe363d063905b671e1b724c02f2846e65e2af7fffca40282d08d35e1c4ff787fc63
-EBUILD liborcus-0.5.1.ebuild 1203 SHA256 a8ac0976f812c3e6346d3598be0cb7d13d623af38e054eb0349b960740f378e2 SHA512 1f1783f0f1f50219b29fd72a01cdeddbedcffd5690edf28c381d6dd17b5c3913b80348f653935355b9413dcd67a6ed2f45d35f1f78d1dcac3480147c838e99d8 WHIRLPOOL 80a8bb77434400e883842db442119c1b92e3455b1ef5226925f49086eabca2c1138910d71a2dd2e97e7ab0c8c98ba2bde51496ce62ba9ebfc19eb19cc811d2d0
-EBUILD liborcus-0.7.0.ebuild 1010 SHA256 f8d1bd46fd93757400cd923cf69bd04af5efd4aa26ed1cd8395b451b46ac04ce SHA512 e478f201a09cab9558b353ce5f3d404d79bf387652d8add3e9ea4cea6fc480eb288a7474ca0740f422575c8aa73a44c6585f714c78fdd38599d5f95575a8c782 WHIRLPOOL f126ef42006c11e6ee8944b2eb0345280cd751dbf29f3943a079d10bff216642db1d0d1eac7b05964187a0015346f69ddbb3e30b75f77d9ed8fc37dde5f78f1e
-EBUILD liborcus-9999.ebuild 1012 SHA256 286f78eb59ff007960f32e7a1e780591a5dd1d655e7df000e86570cee19b5ea7 SHA512 43f4aa10ea607dc92c05cb9adc9d56e8cdeb2fc4d84d0e252e67619f6c82fc54df965c7932f769478bf1cd9120b695edfbc4fb70e1057b9fecafec16ebeec45b WHIRLPOOL 11713ea0bad77ed0e05436a662f6e0e8156d0631eb2af533eaeb2f0592f6a7433601c8d06fd35a761347d916c973c2ccb2351863b5e5c31c1846505519153f2d
-MISC ChangeLog 4854 SHA256 ef029cefe4378a839aadce0f991c1dffb59d4a3e228a0bc205e2a6724778f25b SHA512 5c2fd50ee0bbd71a98319d33a430cae74582ddcae8675fc17235a40308ab1149c02eb2aabd6369a9e9fec4f783a106095cb9c11be9bd344d48d6c4e8819b450c WHIRLPOOL eec82f4f261a0c6f2607a8c1999b8b1b68e50582256a1bfb6124e911a34f495a76629db624b284b1d38adcfd29257ca4bdf1a9c8ef0a6d413bd8a40adbdb386e
+EBUILD liborcus-0.5.1.ebuild 1203 SHA256 bd29121494400247b2895750fafbe439b596873ee41927b4c4d6f40714d44a82 SHA512 aa67ef77404baaa246615c921eba446801e82d0a4bf314460ddf832f4e62f39628aa3c7c41b008e2a8cf4191590e825925ed353a60a265bc433d513d1c299c09 WHIRLPOOL e72224fc43bdef8d2d9b7bd771d8c5032547f2552083dd425b9e5a6b18e2ddc9c2048d5b07a46d3deb3e4b893aacea8070411f96616d8b7492a21f7f13e2bca3
+EBUILD liborcus-0.7.0.ebuild 1011 SHA256 7cfaf993fdaf71603973c163eb74fd674592f2b8fd4e0466121d1c05e1e1cc15 SHA512 cc8981c79d40665c95fd26a7a63d14d48215eac0a66327ea2c5808f3908187c9b3f7be8065b5fa7debc7f241b295ae38b982fe7b1d8a301563463995f4f2f6dd WHIRLPOOL f5f9cac05d1dd4ece5419302704d53135fc5bfa564b87a2563bb67888677d4470c1a489f37c68ce283f8dcfdc520c051bd79074731ddfb95b39c91c520cab018
+EBUILD liborcus-9999.ebuild 1067 SHA256 e1f4ed416cd258962b56130ef60ab23fa491a583e6b4c569ebf050649c685513 SHA512 5e73676bed96280071ab47aa92f00602476fb65dc2aa56274059af5a041a42d27cc63004dd8dcdff29b76aa3a9329bf2f6e6b82fd90d7514613d6791ccc1e545 WHIRLPOOL 21fc30973e71fbb8983514664160549b0f41da533dbed9ac717db100100907f449722f168c3dfd01c5f93ec1c0b51b15936490a88b4fa0127c2b8667e04b2d63
+MISC ChangeLog 5040 SHA256 c5e92ee104f475a4c9a54ffec645a468a2d113eef7ab9c2b519de35a61efbd8a SHA512 36a3f5442794b342057d7e70b2c3ffccecf7eac03ca21153efddbca116b0d70de4aff33146aac009248ce3065ab36fd3195c9177522b8378bdf9bdfa13b4af6a WHIRLPOOL ddb26a297b6b66af956fb2204b5e83eb2a63a87b760467e0b327f9b8f597f98794369ffe846106cdc79ffa09b6ec3c502de9d4cbd98b3b419f2e1b3a5d0d1fb8
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU0ehZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOy74QAIuNKCUgrMgplGeFkddCSp/k
-HhFWSQUqkUiFFg0c8eGLiyec9j32t0gbRpBs3VLFEax10sgAzgdz6VqB7YP8rR4P
-28aYcAg2R2emZn4ypUH/yQUm/5HKCmRvT+39RaO+HkP9TAh6Jc0eBa4FaeAuyVPG
-49EY+tvJ6FeS/0LAPiaZSEhf043mEACjXN1HpQFf6Uw3820XXF3Uq6cqMFyNk93i
-a1KEzeef00NwINnN2G/Q4PX+NMwDZAtuJ4VLYrhX8jO02kqjW6uDUMrt4ZU66wXl
-Wy28ZzvgY+PrZyP+vnsnz1YhPnMb+TmzBBhVp8CpASMARuNDjeuB6LsPhPnWQDH+
-rxlxLTpAwxdzYRt7GH4wPqqrBD6SuyTA4tWoOkmcoykcJmNXt+xe4/9V+IDJiEP/
-1OQ2ld9BB/42XYZtlq4volpzAvKw9LX99gM+Zo/b3dh2r7TXkhf5LI6AY4va2k8I
-CLu/7kE38ucqg6ERFbkRCG8U9WWZkvS++Htl/oLF3QzkrIwWJ4BsCeDj9+bi4Y4X
-dkeGTabtnKclZ4sgxn1PTTGnLyjtHoJ3KjLmBeM0jJZ2MMZEE62VHYa+wH24nS1G
-PHJke7iW6u5nQJIqAHXeBltQJ0LhDIWQblVCtskFvKEt6hKFsteEbBNiOOi5zPuN
-/I2PG/GIO6vcFTb6J6CT
-=6a0D
+iQJ8BAEBCABmBQJU16v4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOctocP/AlNjQaBVZ6cyS5W/7SjSkp2
+19oHxdMNv8O8fo3vzYnVNJ+Tt8NF/fifickMVcCGrMxRTOWVYle0Orb4KeytKYN0
++quKXkU5kSrNX4/8dk/wUajmRUip+oCcf/aco+N40MDL8IFWT5ku0vkTT3Q1inGn
+jYNRhX+/mmAFGd5ZjUHxXHF+t5CeJYwrTcL85FtaY5om6l5YmdN5qv3YjlEAin3X
+eQYWbC1vFIoPhgEURLTaMEfTj7uUW2k/MFJZT7+DrvwS27A/I4h56IMpnAYuVn8B
+eP5qsysFanLe4BZVnAldEK6eT9+Z6N4Rdxb+5UTZPjtNCrW0rr4tSiHJeXvYuxna
+0zxhY29v+tnJmkkbbGJPv3Y9mDNQWY5eKKZlLv2lEuwZQ2xnT9qHk8ywMjTq+dgw
+8Sr3bqAOnNn1mfkdkBzdoPlrE0uwUxj1WTeHhB4jODrYJVZJfTd31VUexhPrjcfn
+pLignQ18DFX4EesoNo/+zv/UUfe51Ymdr9d+ZtvNVgSW+ogoxuNqVQx/desyAiEl
+lyVwf6agwoWDezdgPSs7vrI4mulvWSDGxiGMSQXh+J8akv6FM1BmK4bMw2nkGpr1
+tBvmEp7W3Y4XN7bs3nC9Kbdlvgp/WJN5L7KVSoKvU9Fm4PGkyU2G4KPBb6sQ1vtT
+GWg3rCvKduAi7or+Jp6d
+=tTEX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/liborcus/liborcus-0.5.1.ebuild b/dev-libs/liborcus/liborcus-0.5.1.ebuild
index 415f7d2effd8..5732eba9f256 100644
--- a/dev-libs/liborcus/liborcus-0.5.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.5.1.ebuild,v 1.10 2014/09/14 08:30:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.5.1.ebuild,v 1.11 2015/02/08 18:33:27 dilfridge Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.8.1:=
+	<dev-util/mdds-0.12.0:=
 "
 
 src_prepare() {
diff --git a/dev-libs/liborcus/liborcus-0.7.0.ebuild b/dev-libs/liborcus/liborcus-0.7.0.ebuild
index ce3b17220359..76030f994cc6 100644
--- a/dev-libs/liborcus/liborcus-0.7.0.ebuild
+++ b/dev-libs/liborcus/liborcus-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.7.0.ebuild,v 1.4 2015/02/04 09:37:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.7.0.ebuild,v 1.5 2015/02/08 18:33:27 dilfridge Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ IUSE="static-libs"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	>=dev-libs/libixion-0.7.0
+	=dev-libs/libixion-0.7*
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 0f14f1645d14..bc939da002e3 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.12 2015/02/04 09:37:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.13 2015/02/08 18:33:27 dilfridge Exp $
 
 EAPI=5
 
@@ -22,9 +22,11 @@ IUSE="static-libs"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	>=dev-libs/libixion-0.5.0:=
+	>=dev-libs/libixion-9999:=
 	sys-libs/zlib:=
 "
+# this will depend on libixion-0.9 at some point...
+
 DEPEND="${RDEPEND}
 	>=dev-util/mdds-0.7.1
 "
-- 
2.26.2