Fix grisbi deps for new latex virtuals; bug #196745

Package-Manager: portage-2.1.5

5 files changed, 27 insertions, 19 deletions

diff --git a/app-office/grisbi/ChangeLog b/app-office/grisbi/ChangeLog
index 0a6e674e0590..44ea401249aa 100644
--- a/app-office/grisbi/ChangeLog
+++ b/app-office/grisbi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/grisbi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.28 2008/05/18 14:06:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.29 2008/05/19 18:25:19 dang Exp $
+
+  19 May 2008; Daniel Gryniewicz <dang@gentoo.org> files/grisbi.desktop,
+  grisbi-0.5.8.ebuild, grisbi-0.5.9.ebuild:
+  Fix grisbi deps for new latex virtuals; bug #196745
 
   18 May 2008; Gilles Dartiguelongue <eva@gentoo.org> -grisbi-0.5.7.ebuild,
   grisbi-0.5.8.ebuild, grisbi-0.5.9.ebuild:
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index 8713a2f7d25c..1d51f57fa79c 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 AUX grisbi-0.5.6-latex-unicode.patch 461 RMD160 fa6bd5134e11768c5ee51e15931992fd34050248 SHA1 b8298c8d0fd4bedd32724f2126e155cae838fbbd SHA256 30d8bea8b5c53dc96c62da05a3f374d50cdfcb5ec3c736508c207e04d5f2fa5f
-AUX grisbi.desktop 207 RMD160 94699a50fc03013c07e4ca5db27b7c40638a9bf4 SHA1 406c33d360ca6b51b2604c71d188bac32c7d3483 SHA256 b9b7e7d4c8732790d5abc921ab7888ace6f76baa9d0c78a3ec5484812900c3ef
+AUX grisbi.desktop 208 RMD160 17ed2f83dbb84f952704c265060a2dd6340c2925 SHA1 c48a9df6cec1d0235d99b9ea6880a69b5ceaa278 SHA256 2dd55ad3342f13d6ac2b7fb9dcfb097c60268ccb7bd7276c2b460b3439647886
 DIST grisbi-0.5.8.tar.bz2 984884 RMD160 cc361c7c17ab9786d310fda70c9a8a50d45397f5 SHA1 dcc1c87a62265437bbfd4fd5d603131f3473c569 SHA256 011b1f9aefe39bcb73ec11ff518fae8f281e6264a0c64c8367ab9cc9e28b6c02
 DIST grisbi-0.5.9.tar.bz2 1003327 RMD160 533c398443003c4f13204baa679932fccd777649 SHA1 6fb6ebf5855ac9275c4da539ff94479d2e486261 SHA256 38aacb3007047fdb63816501921c58363737259f6bfe69a900aeb5dcd33498d7
-EBUILD grisbi-0.5.8.ebuild 1692 RMD160 387384b79f7015c933898c7c27930259a15ad51d SHA1 e26241778fdbc07f1b423db0870472b2fc141efe SHA256 434c343894565d9d457c090a900a00778747ab04e9784cba945ade034f4cc732
-EBUILD grisbi-0.5.9.ebuild 1637 RMD160 fc9dd7b05d4d553b70e319f7d5c6437c676391c8 SHA1 d8d1721ec23814d911ffcf072bd020beb743798e SHA256 12f53b6c3341f67b939f7d4a0a733a554f7ca19a589b6b43c5802616055fe756
-MISC ChangeLog 4800 RMD160 17b989a0d50350813fa443987724a32f86574f86 SHA1 0845eb16ca3c7dd69dd5c8c5887d5cadd20e0c5d SHA256 979a0280b76241e3e5306348561149f3ccac715e432d32cf9845d711d6fc11e4
+EBUILD grisbi-0.5.8.ebuild 1735 RMD160 547275c86fb77604d63a67176e021954b39a1603 SHA1 ed705b6aabb908a78e642eba876b8f29c456efad SHA256 5973c255d2dc1b06b9e0584bae6c952d2b053a7fb96d24e7bcbc1c15e517b954
+EBUILD grisbi-0.5.9.ebuild 1680 RMD160 dc217b6c7541a072a540b579817e89019ff009df SHA1 a0bad62f437aca301ea02e68a91fc8eee5a6205e SHA256 047cb225bacacbf1e4cd03d2b75e28106b08b4cbf55ae8f7f69ee8c6828b30f3
+MISC ChangeLog 4973 RMD160 89ac4d8d9bb807af1b0464403dfa37077211843a SHA1 03a94dad8fc4ea05388829c77148ff605b3fa632 SHA256 7c1710d7d1a318bb668757e862725b4a42a78d3648ca2ff000a36196ed307c88
 MISC metadata.xml 356 RMD160 764d72705e02808e78272ee545cda58e93ef9184 SHA1 36b9bb8f89a92efae3bc2d201de34a081ac8fc9e SHA256 61b67ef126a6f8f5f6e11aa195f0c3a24bf363437d3d7b569c5c45b85a5e4842
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgwN9oACgkQ1fmVwcYIWAaxawCfdYto1RAmXyBNM8WVDRlrxPnD
-SQAAoIZIxpxVWA+Fq7mP6G9onlijrxJN
-=5O/K
+iD8DBQFIMcYjomPajV0RnrERAiIUAJwMMaCiHIXB4lXf0iaQIxchDINmTACePwJm
+S3bQ6vPlcPVLERTutgdVChU=
+=EP96
 -----END PGP SIGNATURE-----
diff --git a/app-office/grisbi/files/grisbi.desktop b/app-office/grisbi/files/grisbi.desktop
index e8a9e16f6126..3b4f4034e853 100644
--- a/app-office/grisbi/files/grisbi.desktop
+++ b/app-office/grisbi/files/grisbi.desktop
@@ -6,5 +6,5 @@ Exec=grisbi
 Icon=grisbi/grisbi.png
 Terminal=false
 Type=Application
-MimeType=application/x-grisbi
+MimeType=application/x-grisbi;
 Categories=Application;Office;
diff --git a/app-office/grisbi/grisbi-0.5.8.ebuild b/app-office/grisbi/grisbi-0.5.8.ebuild
index 01e5e951695d..497ef9e39904 100644
--- a/app-office/grisbi/grisbi-0.5.8.ebuild
+++ b/app-office/grisbi/grisbi-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.8.ebuild,v 1.5 2008/05/18 14:06:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.8.ebuild,v 1.6 2008/05/19 18:25:19 dang Exp $
 
 inherit eutils
 
@@ -17,8 +17,10 @@ KEYWORDS="amd64 ~ppc sparc x86"
 RDEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.2.0
 	ofx? ( >=dev-libs/libofx-0.7.0 )
-	print? ( virtual/tetex
-	>=dev-tex/latex-unicode-20041017 )"
+	print? (
+		virtual/latex-base
+		|| ( dev-texlive/texlive-latexextra >=dev-tex/latex-unicode-20041017 )
+		)"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20"
 
@@ -61,9 +63,9 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	insinto /usr/share/applications
-	doins ${FILESDIR}/grisbi.desktop
+	doins "${FILESDIR}"/grisbi.desktop
 }
 
 pkg_postinst() {
diff --git a/app-office/grisbi/grisbi-0.5.9.ebuild b/app-office/grisbi/grisbi-0.5.9.ebuild
index 903dafd420ea..3d89938f1f38 100644
--- a/app-office/grisbi/grisbi-0.5.9.ebuild
+++ b/app-office/grisbi/grisbi-0.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.9.ebuild,v 1.6 2008/05/18 14:06:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.9.ebuild,v 1.7 2008/05/19 18:25:19 dang Exp $
 
 inherit eutils
 
@@ -17,8 +17,10 @@ KEYWORDS="amd64 ppc sparc ~x86"
 RDEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.2.0
 	ofx? ( >=dev-libs/libofx-0.7.0 )
-	print? ( virtual/tetex
-	>=dev-tex/latex-unicode-20041017 )"
+	print? (
+		virtual/latex-base
+		|| ( dev-texlive/texlive-latexextra >=dev-tex/latex-unicode-20041017 )
+		)"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.20"
 
@@ -59,9 +61,9 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	insinto /usr/share/applications
-	doins ${FILESDIR}/grisbi.desktop
+	doins "${FILESDIR}"/grisbi.desktop
 }
 
 pkg_postinst() {