[patch] Patch to quickfix openjpeg ebuild by dropping support for USE=static-libs, effectively

openjpeg-ebuild-manifest.patch (text/plain), 4.93 KB, created by Jerzy Kołosowski on 2017-10-19 15:01:48 UTC

diff -Naur /usr/portage/media-libs/openjpeg/Manifest /usr/local/portage/media-libs/openjpeg/Manifest
--- /usr/portage/media-libs/openjpeg/Manifest   2017-10-16 04:47:08.000000000 +0200
+++ /usr/local/portage/media-libs/openjpeg/Manifest     2017-10-19 16:56:42.000000000 +0200
@@ -11,7 +11,5 @@
 EBUILD openjpeg-2.1.1_p20160922.ebuild 4104 SHA256 7f7d0cea0ca74883a5c294b03862178a0e9064449c0411b08caebe32bda4d39f SHA512 3759a99a8846e7bd48dca6479dc2f5d8c3a6e289c0e0facbfb09b5c0fe8f61a7c56a44510837d9229b7d0e4f437a2bec3cf0abb7fe54b7c946ed069e8f97f1c1 WHIRLPOOL e4207a29cca05e886076f68fa11d2ef50ca7f62d9e8bb7e58bc38046cd06508866a6313a5e1dc16cee8191f2cadb3584f05295dae291ef19c20e102acba6d2f8
 EBUILD openjpeg-2.1.2.ebuild 4013 SHA256 4811c5792ba14a85a6d81a6c5eee57ac047be8270905b95edc17d325c7adc1dd SHA512 b25b772e1dba9af812d82d1a416c7bbd025ccf699e72999fa8d7df45871417bc716436b81a4ce6917b359e3edb95571f58deb70dd49f2bf3889157d91a6ce688 WHIRLPOOL 94ecdacf84872d1dd2e0ce16b0baf481dc27d1fdb67d04ccfa72e0064f35739edde807e61ecd729851c690cd4192b36d54d9d107aef1cca13d699f740daa58b2
 EBUILD openjpeg-2.2.0.ebuild 4008 SHA256 fecf7181aa4b482d10ddcf78707da55cc333e0718840cd3731853b5b8ef38a24 SHA512 67d000a44837aa623b08d95b66a14b1f6a95ba4e03729fec93eabd983295ac9bfe14b2a2f107b047095203598826bd9c9e7936d4737f1fc11bc86fce60f8066a WHIRLPOOL b7460645bdb6412da1fa2e3adc4196c5578d865ee436adcc297ba9b08bf3920470db63dfa18f455b24f72687c5583a7a675bb4302095aaa0adbe6f740986ac08
-EBUILD openjpeg-2.3.0.ebuild 4125 SHA256 1401e1a96dc9a67304781a11b37453a2c3461f929f99f68a3f2c542a5f8a5b6b SHA512 86e30d3f353da1e6b609694d28467a0a31dcc1367a0d8c84ed4a720593bbcc7c22710bb41df9a00091b8d0035c3a3e7ff5a357c954c0a2d32a2d860ebba353be WHIRLPOOL dc29ade29c1bdd643f21493de7930962c52d61cc9894074ea3494c995a5d1c340f993f0f518fcfa84d802b9ab491aaa4ab732a4a738989e4a2da51be19f7bed6
-MISC ChangeLog 7107 SHA256 ab91aa79e988c8ada9fdcd3eb581d62b34f06a4d104898fe6a0692b3822a4841 SHA512 34c554fb7c5b542c4a18b851f5aa9ccdcc47f41ca9815d8a5ebfef6fae9ae65b7265de897980c5adf7a57b1b6fcf7bd6ac0a37b945861a317a578b22b2869e7c WHIRLPOOL 75abb312e47fdf966b704d3dafafa73601a44d32930d243a32e50af0013bb9e286d08777abd2b6a0ba965749d39c94d61a8dd29751fd5d49a14b58446985359b
-MISC ChangeLog-2015 16632 SHA256 16e64b73b25390f6136c6685474f98e28e09511117c2cfd3e80199cadb59e362 SHA512 73cc1e6014a2a2bb5941d794d5b8b8f295ce8a207ecf532d67504ef219eb28ecb722d2fc913de8543abbd94dbeca89193bbb68d9dfb9a1dd774c1018efa0c37d WHIRLPOOL 4297848b013d0c4d5e65238759d36e610010e7e3ea7c4467d5e495fd3c88ce989d78170ff17b2ff69cb991fdb2d1a5772cdb32af952e694691e2a079e0da39a7
+EBUILD openjpeg-2.3.0.ebuild 3760 SHA256 3fe786f5fc6d369f47a92bb66f7960dfd2eabe6db55c5d92867f2feb41ae9bdb SHA512 96374de34d0d93e3f3cc8b1a5060033db97692eb3997fd2315c62326dc153a9281aaa294a05e53a1d4b1e457d443b4d5532fd7f2cc1ced77ca730411b14d4ac8 WHIRLPOOL 7d968814aa849177643e197d9f3c9fbb5580db1bab4abc3693a6be1a40c5910553b3d947c1a48437279da1062391e67ec97fb9347c776513c0fd5405d2e95596
 MISC metadata.xml 455 SHA256 b4fd557d0fea3afd283e339e0c37bfa73e89d3e9b5714b218c610c1a50db0fa4 SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d WHIRLPOOL a020c98df36a2844fcd319067e6778dc07558368421706da6220a591ad8c21bedc4e572ae959e09a7e48d4adf4dd26a0f6bfedfe1e763068882ef8ec871a03c2
diff -Naur /usr/portage/media-libs/openjpeg/openjpeg-2.3.0.ebuild /usr/local/portage/media-libs/openjpeg/openjpeg-2.3.0.ebuild
--- /usr/portage/media-libs/openjpeg/openjpeg-2.3.0.ebuild      2017-10-16 04:47:08.000000000 +0200
+++ /usr/local/portage/media-libs/openjpeg/openjpeg-2.3.0.ebuild        2017-10-19 16:56:42.757784093 +0200
@@ -44,30 +44,17 @@
 multilib_src_configure() {
        local mycmakeargs=(
                -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-               -DBUILD_TESTING="$(multilib_native_usex test)"
+               -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
+               -DBUILD_TESTING="$(multilib_native_usex test ON OFF)"
                -DBUILD_DOC=$(multilib_native_usex doc ON OFF)
                -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
                )

        cmake-utils_src_configure
-
-       if use static-libs; then
-               mycmakeargs=(
-                       -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-                       -DBUILD_TESTING="$(usex test)"
-                       -DBUILD_SHARED_LIBS=OFF
-                       -DBUILD_CODEC="$(usex test)"
-                       )
-               BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-       fi
 }

 multilib_src_compile() {
        cmake-utils_src_compile
-
-       if use static-libs; then
-               BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-       fi
 }

 multilib_src_test() {
@@ -127,9 +114,5 @@
 }

 multilib_src_install() {
-       if use static-libs; then
-               BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-       fi
-
        cmake-utils_src_install
 }