projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7ced6c)
Do not use system vigra, package is PITA.
authorTomas Chvatal <scarabeus@gentoo.org>
Wed, 30 Nov 2011 10:29:23 +0000 (10:29 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Wed, 30 Nov 2011 10:29:23 +0000 (10:29 +0000)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
RepoMan-Options: --force

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/libreoffice-3.5.0.0.ebuild patch | blob | history
app-office/libreoffice/libreoffice-9999-r2.ebuild patch | blob | history

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index ddae2b9d6a8a3265555112607bb5a498eb719e14..258e3d8390b87d9dbfa01e6cdf353f1859c4c415 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.208 2011/11/30 10:21:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.209 2011/11/30 10:29:23 scarabeus Exp $
+
+  30 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild:
+  Do not use system vigra, package is PITA.
 
 *libreoffice-3.5.0.0 (30 Nov 2011)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fbcd13e20f5d5a42cd78eb7b948574780dff8376..73d0dd8b1ad15a720c1d9db5343828dbd5bb4a3a 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -102,6 +102,7 @@ DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051d
 DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 RMD160 d5b50ff1bcb09efd7c1f4167f2d0d38065ba0166 SHA1 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 SHA256 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
 DIST dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip 89510 RMD160 a7dfb272393ba1698146cc7b170c256be11b6f25 SHA1 36ef214f64bab59ce7300f9af8ecff88a218874c SHA256 0f4cc8f5a1fb233f8101c86d5b118ef1c910c623e759da108cb729743deb1ff8
 DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175 RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8c46e02fadd5a01e6272f
+DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea SHA1 43a7ff11dd15370d456b20a093e1ee81279163a0 SHA256 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
 DIST extras-3.1.tar.bz2 130647 RMD160 dc9022051a589dbd810afa9b871472d27c9e80aa SHA1 c4e9c3ed2502c584f1b6e4b7d650afc8c33fccb6 SHA256 6691d40911bf1b1ef7832a5b320e2ab383a79e463ef0dad9b13eb7a5e74c8b1d
 DIST f3e2febd267c8e4b13df00dac211dd6d-flute.zip 83503 RMD160 c73b7919ee73d248d11d433f036b3232e1d151f8 SHA1 76830de4f64998e68c0d03a4c02177c6dfebbfb1 SHA256 13968a9ade310ee464be04380fecbeb2f591a3a462e4048ad1ebc4dae65538f5
@@ -177,24 +178,24 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 f97b7a6b4af7c5187fece7d7c233fc4f17d84449 SHA1 51ea539199105d8edb52f65e930e9580f4bdafc3 SHA256 392e764b95e09716f031ef22118e1eed25a892c75876b3614012b3743ec801db
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 f08a3b1e7826d489a580087b1638a4b98acfbca8 SHA1 f81fb848f6895c3c947fc56f0aef0963f15c93e3 SHA256 9c8adc1a3c217697dcaa7eb3722ae84b47926a9119c39f53b330243bd4b81ed4
 EBUILD libreoffice-3.4.9999-r2.ebuild 14991 RMD160 7abb80f9936495407114fa70260a6fc0f859fa07 SHA1 9f98e13f004793ce15a7285fe7bb2e9860ee31df SHA256 302684d2d6ccdb7ed8a48068f101d0b04037d6ff413bf8b3feccaf9141f19db7
-EBUILD libreoffice-3.5.0.0.ebuild 13894 RMD160 1e6b1f20a510610c539092f2237a5c3a8915c6b6 SHA1 d891a632aff04196e72157ce34ee0c4f35425d3c SHA256 a7efc0ade661d11a4709c5b9dcf753ec7f06b0a51ed3758c8544be1b9a24271b
-EBUILD libreoffice-9999-r2.ebuild 13894 RMD160 fe80e40d9fa97e0e4267d100a50a4a379d395a67 SHA1 662d8c4163f18770e5d65878f2b06309e7e7cf08 SHA256 1ec169f2e3a8206de4aa8607c0a037259ced1358d7764193f43b485fd9074787
-MISC ChangeLog 37682 RMD160 13212d6eec87c0cadb7165b38a6db5246f244188 SHA1 eed3b1ab4c3381b469f88eb0fcabbbc68c1eeeda SHA256 0f37a6153f468a5a5e3a53db3ae5c863010ac7f3e6560a1f49590d75e0effd57
+EBUILD libreoffice-3.5.0.0.ebuild 14000 RMD160 ee3c29e4c529a65a89a3840d8182fc26dffbbe2d SHA1 ba261e7dd845634b4877f6c7f27cb7fbe6912e2c SHA256 b1ca0875c41e78d178996c5cd6c07bd184c8434850b8768915b5226849d1a387
+EBUILD libreoffice-9999-r2.ebuild 14001 RMD160 9550903f6cf52e2178845c2eb30d3667fd50086a SHA1 3b3a1d2dd8d783d60f4fb5aa99b8413d91f78b16 SHA256 f1acdeb222342d7510431dafb58d037227656f53a786bd063c2fceedef62dc6e
+MISC ChangeLog 37840 RMD160 b422439c447ac896e6eeb2ba67d6b7daa76becf1 SHA1 5fa797646da9a49a4b26de8481127ea180964ef9 SHA256 a5b9979493f54253bcc423bd324ca003d156338e645a1b3a252ee3c39c91f0ce
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO1gP0AAoJEOSiRoyO7jvoYrkQALF4jnbIL13eM7pxoESoQWx0
-M8dmRcTSLWv/jjrbEywD4dV3qNwq3r9/i1bVxm9IvVjrKW5g58HoIp/wweZ0i1xv
-qwxiahYBHDF8kPqb660X5eJw+FyOnKM0+4zfnm+VHGO+68ISCGQAI2jB772eltAq
-KJI0tRMlLf5XyKiJMfU9Dl27Az/IrhYAAJsnthjzeQcLopxjAUw3U4N2ecK6DV16
-obGHrvlta2u2yOSAlbhFEpFd4g52jgLjht508Zx2RT63Vxf8sBpgHP2gDKkUApvK
-aTP3DpHg4vMv2kGC0RnvIdw/3w1N3+QdVxVL8dOv0EwDsYR3DhHFHED6YpVFK9G3
-I2MrrkWkxN2DuD1e5jgg7ZnErU8hvVnAjG9HopyeHe3+Y/r5RDhe0SdpnytVQahw
-X9Cbgabut4ugJoN9n16+HF19mx5YNkL/jzWEf6vqHYVoq1rpmHAVSekZHWpTYXNI
-H1WG75Tz1nmKodjwUEx46EWcePdkSkDUV/nDRYc5fpxxwwWiFO3BjZzudrVpmn9P
-Qhg0ALl2qwpPLacrSKjoAGX4pTNqehZHhy+hnP9Ny5RupNYxphtNS7QODNVvbZg+
-FVJmh0WUCUuVhzKXLkjnh/N/A2LIhwr8rbSuA0taCdk6EaCqOUzw3K/Vglmw2qul
-eEDY5yqcMqWhGgWrpSHy
-=+IkJ
+iQIcBAEBAgAGBQJO1gWbAAoJEOSiRoyO7jvoLbgP/2yTkGCKX/npc17JQbykZNDk
+v2qH/66vs2bVj9Y6UKver0dz9mT3wn7Xj+qzHRWZDgv6pCtp6QR6uW2st3gTjYwI
+rLaB7JJ2dxvnxe1xOZYGyQgf/iZ8RcFT3/5Ko7SSWz8RuB1lag9VXrYmt49gBXZy
+9BjmmG/84pLeQmRZd6jWfLOhInJ4lXUO9F/HW6d/MS0G1q5HlDLMDpQkR+DDJ5PK
+4FseuB0XYw6/dK3oguuSpqB+aGA8KqJH8RbahBjiOtkw5VUFpAZtBcUc956EEjL9
+gUk+qo0htshq3ZsJsjzrvfQv8BRbJfM6pXYY1EEfgS7LQa6UotjTcvGlkcQZrBev
+O4jM9c48HebauosdS98bVrJWsSCRJ9c82t4s4CtlaiE8nJjWUii1t55AqilYCCiZ
+s3BSVvMxiU6x1NA6X9cfcz9pGVZjv6uwZcls0c1SXspff0FgNlIwh+aL4Ker5lDS
+DI2fLEdRmJBR2QfK8HcgxZim6e6W84j7LuEGogIuGORW9nxkkrMQAHYBI6D6rvsi
+c3Zxr+ATD4PX/2ItU7r6tiexVD1QnX1tjvZ0Rig/72ZzUUSw4kjrW1Z5sDPR1bZe
++CsRJRHRSzaCkawk341+4bxQpi3Ib9dAAGgFLadzxzjKvGnB2Bu42POFhi4j2doL
+FLyoaMLMcUcGPJscIsgx
+=g0np
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
index bd465299a73221a44846733b6755f4e0c3f6f4ca..62d4735961997084c9ae3827338c643fb246e31c 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.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/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.1 2011/11/30 10:21:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.2 2011/11/30 10:29:23 scarabeus Exp $
 
 EAPI=4
 
@@ -56,6 +56,7 @@ unset DEV_URI
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
 ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
@@ -167,7 +168,6 @@ DEPEND="${COMMON_DEPEND}
        dev-util/mdds
        >=dev-util/pkgconfig-0.26
        media-libs/sampleicc
-       >=media-libs/vigra-1.7
        >=net-misc/curl-7.21.4
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
@@ -313,8 +313,12 @@ src_configure() {
 
        # sane: just sane.h header that is used for scan in writer, not
        #       linked or anything else, worthless to depend on
+       # vigra: just uses templates from there
+       #        it is serious pain in the ass for packaging
+       #        should be replaced by boost::gil if someone interested
        internal_libs+="
                --without-system-sane
+               --without-system-vigra
        "
 
        if use java; then
@@ -346,8 +350,6 @@ src_configure() {
        fi
 
        # system headers/libs/...: enforce using system packages
-       #   only expections are mozilla and odbc/sane/xrender-header(s).
-       #   for jars the exception is db.jar controlled by --with-system-db
        # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
        # --enable-cairo: ensure that cairo is always required
        # --enable-*-link: link to the library rather than just dlopen on runtime
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 4528df598a92f156713d9ef44ddd0d05c6f49265..39d95f00f840b89e8a8d9a363149fe17ad7829b8 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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-r2.ebuild,v 1.9 2011/11/30 10:21:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.10 2011/11/30 10:29:23 scarabeus Exp $
 
 EAPI=4
 
@@ -56,6 +56,7 @@ unset DEV_URI
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
 ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
@@ -167,7 +168,6 @@ DEPEND="${COMMON_DEPEND}
        dev-util/mdds
        >=dev-util/pkgconfig-0.26
        media-libs/sampleicc
-       >=media-libs/vigra-1.7
        >=net-misc/curl-7.21.4
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
@@ -313,8 +313,12 @@ src_configure() {
 
        # sane: just sane.h header that is used for scan in writer, not
        #       linked or anything else, worthless to depend on
+       # vigra: just uses templates from there
+       #        it is serious pain in the ass for packaging
+       #        should be replaced by boost::gil if someone interested
        internal_libs+="
                --without-system-sane
+               --without-system-vigra
        "
 
        if use java; then
@@ -346,8 +350,6 @@ src_configure() {
        fi
 
        # system headers/libs/...: enforce using system packages
-       #   only expections are mozilla and odbc/sane/xrender-header(s).
-       #   for jars the exception is db.jar controlled by --with-system-db
        # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
        # --enable-cairo: ensure that cairo is always required
        # --enable-*-link: link to the library rather than just dlopen on runtime
Unnamed repository; edit this file 'description' to name the repository.