diff options
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 32 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.0.9999.ebuild | 10 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 10 |
4 files changed, 29 insertions, 29 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d626be78f63d..83a17aa2c941 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.411 2012/12/04 17:34:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.412 2012/12/05 13:48:34 scarabeus Exp $ + + 05 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild, + libreoffice-9999-r2.ebuild: + Require new 1.0 gstreamer and disable 0.10. *libreoffice-3.6.4.3 (04 Dec 2012) *libreoffice-4.0.9999 (04 Dec 2012) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 28e2f06fb1bb..72783437f03d 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -36,24 +36,24 @@ EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5 EBUILD libreoffice-3.6.3.2.ebuild 17750 SHA256 65361f853058c7d10c737afc8fe5152e7c11a3ddaf4d7294cd812cef35a0a306 SHA512 1b268a23ddc28369123a3bd3408c703c105354244ed98b3e6336f37c0de55b32f7b26dab92c1dcec4faa12e9464e762870155a1ad7a506d17451099b3ad4cd4a WHIRLPOOL d6dcc0d184862c1cbcfcb120cfd30681c43a6a987c8c06a92daa522074460a059bc43c6b09bf07229fdd3c6a2113e5cab998680b0de852dbb0b2ee54349bdace EBUILD libreoffice-3.6.4.3.ebuild 17472 SHA256 a681c297835874b3210fe2a8c43fe0e1987a789371ca88c011faf40def56de23 SHA512 05d2898d692f6e9bd7128c985b1a915a96cda1741724243fe97ec1102d537c627f5f3e2010ded74a7c7671a7962396d6dd5e54e24c5c689e0c05cfff91aab120 WHIRLPOOL fa9ab379df1f0f94ba1e351638c471327ec3b92c16245c8262a41651a03fe8e8726183c510c637ecdf2dd605216b22e0ac7de62e85b7d005350b939c33d3bf7a EBUILD libreoffice-3.6.9999.ebuild 17474 SHA256 f9ef876bcfd4f1bb99995fcae1a9882a5ac34e73df2c8e343f23d544b0acb5ab SHA512 9322420f0922f973967462dfe51d539de7b10277a17802b619ebe32bf36719849e52a68fcafd3234194fc9c5effedf92d577f092783a97995980d3c4052f7037 WHIRLPOOL e9b61fa503b354c1b5d764ab0f69ab676c46c34defa80fa585d85b7d04a5088fba9119c0693c5a543a31bc820d8c854a4d18aaa69bc2af7f18c078237b943046 -EBUILD libreoffice-4.0.9999.ebuild 17537 SHA256 22b1e3db0d044f6cc89b4579cc51a7d7fd28c4fbb53d3fe02da3ab9a0754daab SHA512 c47e6a7fcced1bd5e0983c4b3d2dc76dd47f6d83fbcae9b2828e29fdbba041381dec58721edca4489d038d70d2582f6ee00e2644bdaf07e1ab417aabcd20bcc9 WHIRLPOOL 0abb380dcaf06a424d7b7701b27d2d3d1f275ac8a6bcfcfe9213fb2aa21160931f0a4a3932c0518f2b80716926950b20127cad989824978f4994ca261bf8bf3c -EBUILD libreoffice-9999-r2.ebuild 17538 SHA256 bfc5a75b1c53beb79baad5d1ba6e9881957614cb79eab8f92af87c4d734fc88e SHA512 8130493e7a0f3b56306ec6d94e5d89c975300c40f3ad6824fff76c444ed782c1f95b03f2c63e521990ff66530d81dd0f87739d93ab0699bf9f5dd4d6ef00581b WHIRLPOOL 70bd14532bdddbf2c9dce1b1d3c5074e1bbb892a18deae0472053189406c96c16ef48e54a528eba0c1a5c09c551cec8dd60f966946cc5c422da9fac3fed06002 -MISC ChangeLog 74447 SHA256 d972a92af8deef1a5d2ec38a5abc3027b5ba39e57e2835e211d85445456df8c8 SHA512 6209305618ebf28bfb33d717a1c18af5107695e86f613a961e368b2bf8710cbb1f1460373a20fc89b47aadb010961505cf12eab482305c54897d74f03f8e4de2 WHIRLPOOL b1add653517a610dd590724398196c515f0a03c76bb7ef07b4dd4ec4c92c289b9ff1bcc62fa9224357f0dadf93907c9d6585e7a2eb2fab7aac3ffae245f015df +EBUILD libreoffice-4.0.9999.ebuild 17408 SHA256 91ce9115d756716e3a375a6a827f0c5db6c483128beb1eae9886370611a9d229 SHA512 dd1c61c0555e8157222a5f6a32e00342ba3088bbf3797ebb542d0bed2954c677e544a21d3297f0913c7eb545370919386e511e05e1dfa202f8db0eb286050a88 WHIRLPOOL 6021f1d08056e22bbccd284dd8e927494e108dcbf1fb9b3702fe7fd53eac389ab962fff36c56f9f88a17d6cb67d72cb4a4284c3c0a459083e6ea6059de74370b +EBUILD libreoffice-9999-r2.ebuild 17409 SHA256 1a2eee0c0176090f70b342d5c6b8bc977ca6d37e448f60e3409e4ec62e71c5a7 SHA512 f83aa87395be17b3d0351d45e6dfa41e990ccbbe72b3256b65be35def9e1a82363a7a2b16d1a201bb573303843ec122fc04b54dfd17ba882edad7398d7ce8c60 WHIRLPOOL 6020267b78d2236022ef1acdf565d77081c7595bdec93871d34d14c1c4b23b3867799a458394e6421f98eb70e51f241e029de51f08ba087d3f503bf6520224ff +MISC ChangeLog 74608 SHA256 8e6455de0bcb03b38611cd9b8a06a8db75b8a0b2304d898ae1dec4580ec8ca3c SHA512 c4b30ec0168f6a9e0f06cf4562dbb8ac8c318e33b5ded2def161e22acd4a9fd70897ab35310d859cf7afd006ec6a8e7d1dddb4a605e854cdae153990aebbd375 WHIRLPOOL 5edc35e6238778f899ca551d7f619a2ab44ece92555a8450c3aa1efae70a3b0cac2c696b128a3c2d5877d637787fd8fe719f62ed4c4d19e4a6773c9fd07db9f8 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQvjRNAAoJEOSiRoyO7jvolMIP/iqVOKfutIZ2oz16XKWymTlm -+60bivPb5YlIhqoDGWmbuu33L2s2ZxsAEcH+MbemNHWYJ9a/41LMfztCCKuVlyJ9 -djRU9F2UsPzxxsSJ7yeTbhIOb8Eck1/Rfs78xhGHRQHkvfvlYRXPUsN452HTvpcO -5dS+zXRKqmq4Y0brwcrca1DHtUrWmoDe1BLH9jEe0N2kdFQprIJHvALzPCnbbB1N -ccX0mnZtx1MI78EN+oSj9HfZtFxWfpgkBCBgs4P993CpBzxxVx8cZ0X0sLGU+xSU -0CiFnFmFqGQrJFO4uEwWwnDkOlxSOw1vS28lvitNfuYL6oy0FcZgJHUqBcOQkDOM -W+axEEvX/lpGlLYEG6aIy28u1nTqWr16GbSHUusf4LDEcFsUu4O3IuNrCMYN7jJM -YL9oBbS4A2aBlUuumrOWse7Geqp9WDscWavZGU4oRWrv/qeLKu7C29QGjyitb/fX -L0DwcDgAkGOx4Y5glfkk7byl7O3WF7co3lJ786ldEVOvvIGxqx3TsjCSwzUb0o0D -ph6F9QxaWhmRM+Kb0k7TkW+uJYSS65CIpw72jEPyIJqp09GQ3eoYdYxny6q0jpgM -Sq+tuLBsgb7WmITo0fKZtqXeMx6l7sD6rCZSbY0UmJxQRLjUYHxIwkBBGfinnHgT -te8vYT0na8OxUZspPPOx -=aMmB +iQIcBAEBCAAGBQJQv1EFAAoJEOSiRoyO7jvoiRwQALL5i+bwxsFdvHzGv3BliFf3 +oEkn05gr3wBIjTHCne2SaxHYDeqp29/OBa56zMgKoKVvxaWAlyTh6eElWve1KYlx +UVcJzuc1ngVhZOmzetoObQ4bG2mLSZG8qyDgKqQBs8qMIPeMkURLIJf8Wh84he3t +FqBSWkQF7eou+SBBN0PXF5zahPsxxi59GitBPGcKKD9XBPtKh/eEM2HCXVD2aX1K +FS6PHkSdbbWeGmn2BEReE6U2VD3jhULtuqvVvSTpLcoiexUI/4aUDN5ksHbunSCc +v2vtS0sZA9GDUiUMN7fcf8kYJpGRSclU22o48G9EQWepP6Dr0rIb5fDoLtaXPk6I +OOby+O42uhc8Z76sgDoaRhjTn7vMhpdQtC5CmGvieN9i9gvSj81SVS+5URAOXY6z +/VxT6XFowi6lL8w46EirxSBRZWmeJ1eNeUYmZhS6ThQLkzavc4WShghTYYpG7FMA +GD5YvV1Tz6odZnLZ3wgPsq9MI0BnwXG/qQ9A5pZnCUiPNzCkjx0LWT7LI3SWL8RR +/Qnd/OSL7THBNpQvg5HM447raWgR+R+k6PNyIMIf+BBTq0N3dYLfJTUATIYBSkUy +yLtcrqyr6C93dy26Ieapmw2UPGBbglx76UY3f9jAuVOhj9BLbzKCo8Cvivz0aD7P +iDpobtm0quWEUYBLOWGf +=ur70 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild index 52d71dcbe59f..cb00f951cffe 100644 --- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.2 2012/12/05 13:48:34 scarabeus Exp $ EAPI=4 @@ -137,8 +137,8 @@ COMMON_DEPEND=" ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) @@ -414,7 +414,6 @@ src_configure() { # --enable-release-build: build the libreoffice as release # --disable-fetch-external: prevent dowloading during compile phase # --disable-gnome-vfs: old gnome virtual fs support - # --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now # --disable-kdeab: kde3 adressbook # --disable-kde: kde3 support # --disable-mozilla: mozilla internal is for contact integration, never @@ -449,7 +448,7 @@ src_configure() { --disable-epm \ --disable-fetch-external \ --disable-gnome-vfs \ - --disable-gstreamer \ + --disable-gstreamer-0-10 \ --disable-ext-report-builder \ --disable-kdeab \ --disable-kde \ @@ -488,7 +487,6 @@ src_configure() { $(use_enable gnome gconf) \ $(use_enable gnome gio) \ $(use_enable gnome lockdown) \ - $(use_enable gstreamer gstreamer-0-10) \ $(use_enable gtk) \ $(use_enable gtk3) \ $(use_enable kde kde4) \ diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index fb7be7a3a2b9..5d39e9c2fdaa 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.137 2012/11/30 20:53:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.138 2012/12/05 13:48:34 scarabeus Exp $ EAPI=4 @@ -137,8 +137,8 @@ COMMON_DEPEND=" ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( - >=media-libs/gstreamer-0.10:0.10 - >=media-libs/gst-plugins-base-0.10:0.10 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) @@ -414,7 +414,6 @@ src_configure() { # --enable-release-build: build the libreoffice as release # --disable-fetch-external: prevent dowloading during compile phase # --disable-gnome-vfs: old gnome virtual fs support - # --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now # --disable-kdeab: kde3 adressbook # --disable-kde: kde3 support # --disable-mozilla: mozilla internal is for contact integration, never @@ -449,7 +448,7 @@ src_configure() { --disable-epm \ --disable-fetch-external \ --disable-gnome-vfs \ - --disable-gstreamer \ + --disable-gstreamer-0-10 \ --disable-ext-report-builder \ --disable-kdeab \ --disable-kde \ @@ -488,7 +487,6 @@ src_configure() { $(use_enable gnome gconf) \ $(use_enable gnome gio) \ $(use_enable gnome lockdown) \ - $(use_enable gstreamer gstreamer-0-10) \ $(use_enable gtk) \ $(use_enable gtk3) \ $(use_enable kde kde4) \ |