From: Tomas Chvatal Date: Sun, 16 Oct 2011 14:12:14 +0000 (+0000) Subject: Try to sanitize the deps to not pull so much testing tree. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3afbd5ca2e061b33ad108c7576c8a215236d7679;p=gentoo.git Try to sanitize the deps to not pull so much testing tree. Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 9596fe4c31ee..a02c6fd7c636 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.172 2011/10/11 12:38:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.173 2011/10/16 14:12:14 scarabeus Exp $ + + 16 Oct 2011; Tomáš Chvátal + libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild, + libreoffice-9999-r1.ebuild: + Try to sanitize the deps to not pull so much testing tree. 11 Oct 2011; Tomáš Chvátal libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 50aaf6986aa9..08904f7bbc76 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -151,25 +151,25 @@ DIST libreoffice-writer-3.3.4.1.tar.bz2 6778265 RMD160 a2a3bbe1f8e6ff0f03b419ece DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1 -EBUILD libreoffice-3.4.3.2-r1.ebuild 18443 RMD160 003fac975e22979f6d83775c74bdce01f68b0fd6 SHA1 ed41080e7477a81c87536f19b9c71daf1cf71bb2 SHA256 cc07b25d5c374c493fe3b90fdab63ca196f346cdd337638c1d31ba82de153f57 -EBUILD libreoffice-3.4.9999-r1.ebuild 16232 RMD160 c231738d7bddf6864506de2340e689741516de06 SHA1 c1088425b7f4e05d206c9fb82852cab485d3023b SHA256 854be998206ea97ad425a41e2b287aa4e4f9c4bcf2da8b39bf5e5e0688d6fb18 -EBUILD libreoffice-9999-r1.ebuild 14388 RMD160 56ff345063b3f643498ecbc01f4ea6c563e688ed SHA1 e5e345281c6e829c8eb965869212b413cf193dae SHA256 b6c419e878a4aaeb4d371040f68d95543a099246d1dc433381c31b30190694ec -MISC ChangeLog 31543 RMD160 b8008673d1d6e73d2c5e819736645596c40dea43 SHA1 ecc3748bed54a431c2094af64f2c344efb8333ad SHA256 08479d2486151327ad022247eec39378a9f61fd304c2d1ca0c07fe378c88cea0 +EBUILD libreoffice-3.4.3.2-r1.ebuild 18446 RMD160 ea7208dc6ed726a698cdd68c96be0417eed323fa SHA1 b82fc9f6ee1215215fdc80f40c76307c9792b459 SHA256 629940b89965508ad7de68acd9a770b10c4d53e8d11b8bd769a7777aded1ef3a +EBUILD libreoffice-3.4.9999-r1.ebuild 16230 RMD160 12da92baf8fdf3250d943a00b62d045982e0d5eb SHA1 5ef3307cb00a6aa7fa090ee8b2341e701b0d56a9 SHA256 9b0c44ce4df7313afd3cf4838113db7e1017ec41a0747f318e5ed3fd3d7508eb +EBUILD libreoffice-9999-r1.ebuild 14386 RMD160 a468ed81072f639a094d5ce034c22df90ac5ad44 SHA1 19aba4018ece2ff819299975a6d5a7b245fd9d49 SHA256 448124014b089065e9f1c33baee43414d082e9da7500b691bf84dbfcba47ff69 +MISC ChangeLog 31755 RMD160 bf626e695ad4e85c935fb986b334199bc1ab9c83 SHA1 c7cd9f93f41874730955c932f0d5c5cee4f89fb4 SHA256 6cccf09357de8cf1527a037d2c4a14e45f30fb306e03bc75bb7dbb90f0410797 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOlDobAAoJEOSiRoyO7jvoqzYQAKYnhWCYK/pXYCy0mLex0FmJ -RvsNAP2Ah0o9lBfxXJBMBHfeSiHsSkrTdsNTVQLF6e9c5xCiUZiQebBXtXqIm4PX -eJJWX0RwmXLqL0KmQYHU+JHblaJJEDwB2b9Y5HIJcpxzwbI/P7DuFopkk6CZy33l -30xm8l63elCl5vdtdEOOb5ARzhJekqmsl0tb0NQ2Y8nRG9fv2tYZwr9AR0ue+3NM -PYtLS8PR1dQcrQ3ER0lvVxxe6lhQbS0R6B0AQAgC1neeVwZrcmOXEluRfHoQYFC4 -TYPtvjHT9Tmt13n9nYPbyQ8X0D9Wtss6LtELvQHb0qtM1GkRMTxCxOUgQuwkBstW -hw+pQ3tASQoY0mPIbK5JgqLiFuziPiiBu2ajjP5EQb6xhkB4tDIR4YCJIZ5COb0W -3F+RlSxax8sW3Y3SOu6M42jqPqa/lVXXC0s5Di7tX3Gd6T7e1Dj5S/LKt0nXgxrp -O3ZchQNEcFyIiPLsnKNmaUaePaz8kK9UnnwsWgzL66PDrvDvBZVIpWs+mZJ210xF -Jk/98Yhrq0HApjkqdgC4isdhcjtNUzkBinx7k7S1qq9meOO5Tnn5LkpCdotaNUtj -Z23p90fbgBcuQP6dfyomNpbtge4FXXG+pqCWEB9ByBC3L621cYqbRKwt1DgfY2Oj -vyVpa6BkW39d4Pbox2S7 -=I/vu +iQIcBAEBAgAGBQJOmuXlAAoJEOSiRoyO7jvog14P/2OebEuQ55W28u/GLUu1YnIh +IH64OV6pSI6qZ/d7Rtk9Ddok2oI0zySYm+Oq6uZY50waDL+eVaesogQ5VFG2ETtY +Ua/sU8ItzU6Sg/AyXvn/ZKuIijjVSsiEAeRNL+bk8XpexznaqNRs09Fzk2tmOPrM +9t8nPKORIxb+JqhPZA9DlIsxMCW1FgrVO1yRvNoZuKydKeGoVqWy8WF5jBtc7Zz9 +DCN2k50Rnx2gw15p9zJB7f8ar1UzYt82lBLbiEuamVVBFvVRlbcarXCXi2GI2pdp +FtS+Pal9aPVyGX/Mxyh5yawDavi4FA6swGJUtSATwZ0KSDcGJW2cf/DbNP0Fep/Z +vm1kZ+YhWl7eyg8WH0pBS3R9zKuKxby7YWXC427J4dbotrTe5jLuAB+oammKVm8u +GIz/SEthAnHy4AuKmsfLpu0O8CK9iW1Y4v28chrVqo0OPigykPjs4QJCOAHtIxiv +fWCACBm9G7cRjm0BUilbHpXEDfeDiNhW8tHCl5DEyKy2eTuRrqtE8x+Sn/xvgucw +gj9BIzr5CfDR85HovjLoxsRiMhkexgSEP4H81PBdO5+zc5/2qqMl6VkyJTa+qFLF +KxS4nd/4sJTifoi68+EclxvRBUkNXNeXrTXMYJj8bFMAnmIamF6xalXnLoyUcENN +bWQ8hRy40l1AvD46o4oS +=NJTi -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild index 7beea3485bba..71520ce6dd37 100644 --- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.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/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.10 2011/10/08 08:23:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.11 2011/10/16 14:12:14 scarabeus Exp $ EAPI=3 @@ -117,7 +117,7 @@ unset X COMMON_DEPEND=" app-arch/zip app-arch/unzip - >=app-text/hunspell-1.3.2 + >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 @@ -125,14 +125,14 @@ COMMON_DEPEND=" >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat - >=dev-libs/glib-2.18 + >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-0.9.8g dev-libs/redland[ssl] media-libs/freetype:2 - >=media-libs/fontconfig-2.3.0 + >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups @@ -144,7 +144,7 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - dbus? ( >=dev-libs/dbus-glib-0.94 ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) @@ -190,8 +190,8 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 - >=net-misc/curl-7.21.7 - >=sys-apps/findutils-4.5.9 + >=net-misc/curl-7.21.4 + >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild index e8d9c5dbe910..934353cecde0 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.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/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.12 2011/10/05 14:25:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.13 2011/10/16 14:12:14 scarabeus Exp $ EAPI=3 @@ -91,21 +91,21 @@ unset X COMMON_DEPEND=" app-arch/zip app-arch/unzip - >=app-text/hunspell-1.3.2 + >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat - >=dev-libs/glib-2.18 + >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-0.9.8g dev-libs/redland[ssl] media-libs/freetype:2 - >=media-libs/fontconfig-2.3.0 + >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups @@ -117,7 +117,7 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - dbus? ( >=dev-libs/dbus-glib-0.94 ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) @@ -141,7 +141,7 @@ COMMON_DEPEND=" >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) - pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers] ) + pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) webdav? ( net-libs/neon ) " @@ -165,8 +165,8 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 - >=net-misc/curl-7.21.7 - >=sys-apps/findutils-4.5.9 + >=net-misc/curl-7.21.4 + >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index e809368d4445..2175f013478f 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r1.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/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.41 2011/10/11 12:38:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.42 2011/10/16 14:12:14 scarabeus Exp $ EAPI=3 @@ -92,7 +92,7 @@ unset X COMMON_DEPEND=" app-arch/zip app-arch/unzip - >=app-text/hunspell-1.3.2 + >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.1 app-text/libwpd:0.9[tools] @@ -101,13 +101,13 @@ COMMON_DEPEND=" dev-cpp/libcmis dev-db/unixODBC dev-libs/expat - >=dev-libs/glib-2.18 + >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-0.9.8g dev-libs/redland[ssl] - >=media-libs/fontconfig-2.3.0 + >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio @@ -119,7 +119,7 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - dbus? ( >=dev-libs/dbus-glib-0.94 ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) @@ -143,7 +143,7 @@ COMMON_DEPEND=" >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) - pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers] ) + pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) " @@ -176,8 +176,8 @@ DEPEND="${COMMON_DEPEND} dev-util/mdds >=dev-util/pkgconfig-0.26 >=media-libs/vigra-1.7 - >=net-misc/curl-7.21.7 - >=sys-apps/findutils-4.5.9 + >=net-misc/curl-7.21.4 + >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex