Fix dependency on bzip2 static for future versions as reported by Arfrever.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 3f6aa349b8d1a6c9e691ae3199527059376f7ee5..94d165d378024134d83afc46c27997c4844e81be 100644 (file)
--- a/sys-apps/tuxonice-userui/ChangeLog
+++ b/sys-apps/tuxonice-userui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/tuxonice-userui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.23 2011/10/16 16:45:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.24 2011/10/16 17:01:25 pacho Exp $
+
+  16 Oct 2011; Pacho Ramos <pacho@gentoo.org> tuxonice-userui-1.0.ebuild:
+  Fix dependency on bzip2 static for future versions as reported by Arfrever.
 
   16 Oct 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Co-maintain this also.

diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
index aae5496be60f59bff95c1c7ed81c9a70ba6409e0..2ba4b8226dfb65e3f29490213bb2931a14ecb0cf 100644 (file)
--- a/sys-apps/tuxonice-userui/Manifest
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX tuxonice-userui-1.0-Makefiles.patch 1438 RMD160 4178677bbf596c2db145dfc4de8bf6840ac7a5b5 SHA1 7f4a0894eba5463757d1f6a8918bd0f70fd620da SHA256 a615252845a09af805b12c987cad459162dc98b6987c25123e68113d12339223
 AUX tuxonice-userui-1.0-libpng15.patch 3368 RMD160 536b3477ebb995de71b0e9f7ec7d0a5685fe8ad4 SHA1 2d2615bfc213d21d251ca1a5c299a343e15ddebe SHA256 c6b46ca700a70359755dafa9536daa4c7aca1c2fa5e12e9e0df1d220e8a31341
 DIST tuxonice-userui-1.0.tar.gz 66922 RMD160 b6e7708e5f1f3368c96833346e19d2c9127a99c5 SHA1 31f0bf3f7dff1d8eff153e5027886bee677e181d SHA256 2da4a5eb4597fce89a43cac5e794e19a000e324a5873a54c6b0848e1b481942f
-EBUILD tuxonice-userui-1.0.ebuild 1718 RMD160 c823068a4f49185f8828b59ca5132d03bd1d9d69 SHA1 511715b7bb72754c72bbf0cd3003530260f6df07 SHA256 44f13b0bdce1e77ee31a30bd5474958901c37ebfcb8f2ea95fcb8019b500a47f
-MISC ChangeLog 8315 RMD160 709c3056433c8da6d7544ffc1d9ffa9426db8519 SHA1 a7a4e5d7de2a6e47b6627775735251b37f1fdd31 SHA256 11a76fab41ce187038773d2259482305b54376be428b398ae4d6ad419ddae6b6
+EBUILD tuxonice-userui-1.0.ebuild 1772 RMD160 bc12cafea220fc67beb3fdcdcc04315e1046e5be SHA1 bb9da48fdc1dc4e1d00cb742bc90fb5208564627 SHA256 de8acd072e7c316543eaad166c43847b363d8a54afd7b89da89264ab67d4ccf8
+MISC ChangeLog 8468 RMD160 ef43e931c5ca76aa4a0a1116b05d99265e83df93 SHA1 0e5e8fe5c4cf328503379ebbf6a6967733a1da0a SHA256 28256516ca7cd83fb5b6a20fc5698e206ea39a5a6aee4fcf696d2071fddb3674
 MISC metadata.xml 429 RMD160 fc55adcfdc388acff93524d736694594ebb99f6b SHA1 2599c432a6689bd1532bba1c1653f72e810e1451 SHA256 969993da264e9371286d0cd76a5730011276a4af6bb2c4dad6de146f3b0d24d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6bCjEACgkQCaWpQKGI+9TZsgCeIQLtmVanr53KGgD4YBk36nv4
-YvAAnitEwdZesxvWQT5h+MpFGUbST6cb
-=usCc
+iEYEARECAAYFAk6bDesACgkQCaWpQKGI+9QpSACeM2hjW/Rx3oxA1989eFmY7JCt
+QUMAn0x0n5pWryM9eLnjFAh1BCcoJNqr
+=dLty
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
index 9d3f9c116adc5e6bc89b593543a8de3245df7d20..6f107a993ac90ddb4120f1c133bbd5d0f4eb182b 100644 (file)
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.9 2011/09/26 15:34:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.10 2011/10/16 17:01:25 pacho Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ DEPEND="fbsplash? ( >=media-gfx/splashutils-1.5.2.1
        media-libs/libmng[lcms]
        >=media-libs/libpng-1.4.8[static-libs]
        media-libs/freetype[static-libs]
-       app-arch/bzip2[static]
+       || ( <app-arch/bzip2-1.0.6-r3[static] >=app-arch/bzip2-1.0.6-r3[static-libs] )
        media-libs/lcms:0[static-libs] )"
 RDEPEND="${DEPEND}"