summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-09-10 15:59:05 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-09-10 15:59:05 +0000
commit6f42ad1698ca4d95a14ac9df7e25b8fcabdb3456 (patch)
tree86ad7219d52377a258e2bfd1e5a7a20b358421c6 /app-office/gnucash
parentFix lzma-utils vs. xz-utils deps. (diff)
downloadhistorical-6f42ad1698ca4d95a14ac9df7e25b8fcabdb3456.tar.gz
historical-6f42ad1698ca4d95a14ac9df7e25b8fcabdb3456.tar.bz2
historical-6f42ad1698ca4d95a14ac9df7e25b8fcabdb3456.zip
Fix lzma-utils vs. xz-utils deps.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'app-office/gnucash')
-rw-r--r--app-office/gnucash/ChangeLog6
-rw-r--r--app-office/gnucash/Manifest16
-rw-r--r--app-office/gnucash/gnucash-2.2.9-r1.ebuild4
-rw-r--r--app-office/gnucash/gnucash-2.2.9.ebuild4
4 files changed, 12 insertions, 18 deletions
diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index ea65c12d0685..96e3842fc2b0 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/gnucash
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.198 2009/09/06 19:23:43 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.199 2009/09/10 15:59:05 ssuominen Exp $
+
+ 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> gnucash-2.2.9.ebuild,
+ gnucash-2.2.9-r1.ebuild:
+ Fix lzma-utils vs. xz-utils deps.
06 Sep 2009; Torsten Veller <tove@gentoo.org> -gnucash-2.3.2.ebuild:
Cleanup
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index d2d1ca4b5473..e157c9ac3c19 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX r18166-to-r18167.diff 613 RMD160 0bedad00ccf3c9f3627bbbba04f981f2933bfd1a SHA1 0eb0d51e0a1c2cf9e8996c4d0ab287522079b941 SHA256 68b4e3a9c0235101596984a08e7d7c498f38fe4614b087a94a48fb7e5548d0a2
DIST gnucash-2.2.9.tar.lzma 5210184 RMD160 2e16625b59762a52cea09cfa8139138ee21c6fb2 SHA1 b7debe12fcb2770f5ec4524ec56c57adbdad19d2 SHA256 07b02908d614da6d9d83db07bca6054ed662be58c4de7c541d8c5b8263256c17
DIST gnucash-2.3.5.tar.bz2 8571909 RMD160 2899b122bd473974eb8c14d4bf3d5b9bbec118d8 SHA1 c6de97f0c3f145f1c059b11518bc8bbcfc2d1366 SHA256 eb1ba3ee631aa1a77619281c86a15d7344801e8220379976d1745393906b651b
-EBUILD gnucash-2.2.9-r1.ebuild 2238 RMD160 fa54bc6b39b813ab36ad53a56e14b4a42dc534c8 SHA1 613da845368b767892b9c47c60f1532f757a9922 SHA256 20b55800293a8e4cf08b0065504ea74b03e245550681de49ecaf3e47113a4aff
-EBUILD gnucash-2.2.9.ebuild 2128 RMD160 82362696ecf754841c6ce7424674dc41cd330e90 SHA1 29b3f52519999b60fe5cef386500bc1285a369a4 SHA256 745e7fbc58a0cb835eb09527d8d44cb9944dc08818ddd2c52bfca8b980e3f60c
+EBUILD gnucash-2.2.9-r1.ebuild 2266 RMD160 bd0377c57fbf6e8b55fcb5c35d6ed0daabe723d4 SHA1 b34c7adc66a814d9773048f1b113cf36bd5696ce SHA256 1b7f76adb5931bc7565f2107a4d450fc0df6cde486facbf8a5bbb80e1a4dccf6
+EBUILD gnucash-2.2.9.ebuild 2155 RMD160 5bd0b0e1b6ad100758687af004c84003cc08c3a0 SHA1 2bf50901f7e8b6fcc77cbcb0eb739ea401bc6b9d SHA256 de321490aa6c6889ba514315c0dbe2b4bfb155601ed863f9278ac41311825a26
EBUILD gnucash-2.3.5.ebuild 3138 RMD160 124f86c0702be21ad1b4a63d5305746b660e60ca SHA1 4e3d65fb025030afc2fba99010cda75190fda763 SHA256 94b7881244ae56d2ad8eebd63cd85d9161dbf55767a2ba62b6eaa6d2303695d2
-MISC ChangeLog 28755 RMD160 1770ef7b5cb9ec96729091a3f7df1f38b67cce61 SHA1 a5ccb457e6745c0038f2ce56cc4579573a75c803 SHA256 0a72957cd6ad81ad0068a2017ad647e879a68ec7aefac8a5d4bd45948ae2347e
+MISC ChangeLog 28900 RMD160 455d5e2417a11230402eac5ae8e0b29e3da55df2 SHA1 478e513f17cb52466cbe5123023aa9ee174533c9 SHA256 66642e151505cc2f5a84ac0eaafd8a17f4ec12e030625128f5a73f8dc3e194a5
MISC metadata.xml 623 RMD160 1949bdf751945f68f6d552e7d9c4f7b8e6de2f8d SHA1 5cc6ee5bf4eb04309cab6ef0be1e23037223b342 SHA256 f03c025ff4907f95cf7eb8b135f0704f4efffb5f0111894da2c1c8f120012cd6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqkDEQACgkQV3J2n04EauyVBACfYD8Wq6xM0JButqd66GpEtJru
-AfwAoMZ4SB61gBylyZc1kKpIinM59s6l
-=dHAh
------END PGP SIGNATURE-----
diff --git a/app-office/gnucash/gnucash-2.2.9-r1.ebuild b/app-office/gnucash/gnucash-2.2.9-r1.ebuild
index 66ddabed558e..268e4ac1a228 100644
--- a/app-office/gnucash/gnucash-2.2.9-r1.ebuild
+++ b/app-office/gnucash/gnucash-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9-r1.ebuild,v 1.6 2009/08/02 15:30:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9-r1.ebuild,v 1.7 2009/09/10 15:59:05 ssuominen Exp $
EAPI=2
@@ -44,7 +44,7 @@ RDEPEND=">=dev-libs/glib-2.6.3
x11-libs/pango"
DEPEND="${RDEPEND}
- app-arch/lzma-utils
+ || ( app-arch/xz-utils app-arch/lzma-utils )
dev-util/pkgconfig
dev-util/intltool
sys-devel/libtool
diff --git a/app-office/gnucash/gnucash-2.2.9.ebuild b/app-office/gnucash/gnucash-2.2.9.ebuild
index c453b3bb8a8b..134259c4da23 100644
--- a/app-office/gnucash/gnucash-2.2.9.ebuild
+++ b/app-office/gnucash/gnucash-2.2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9.ebuild,v 1.6 2009/04/27 13:07:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9.ebuild,v 1.7 2009/09/10 15:59:05 ssuominen Exp $
EAPI=2
@@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/glib-2.6.3
x11-libs/pango"
DEPEND="${RDEPEND}
- app-arch/lzma-utils
+ || ( app-arch/xz-utils app-arch/lzma-utils )
dev-util/pkgconfig
dev-util/intltool
sys-devel/libtool