From c147e457f3b838c1f8adfcaa41f1104e82a572c6 Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Fri, 18 Apr 2008 09:51:36 +0200 Subject: [PATCH] Make lzma-utils dep conditional upon qt-copy USE. More work on the qt-copy eclass. --- eclass/qt4-qt-copy.eclass | 7 ++++++- x11-libs/qt/Manifest | 8 ++++---- x11-libs/qt/qt-3.3.8-r4.ebuild | 2 +- x11-libs/qt/qt-4.3.2-r1.ebuild | 2 +- x11-libs/qt/qt-4.3.3.ebuild | 2 +- x11-libs/qt/qt-4.3.4-r1.ebuild | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/eclass/qt4-qt-copy.eclass b/eclass/qt4-qt-copy.eclass index e7d6ee1..632ee37 100644 --- a/eclass/qt4-qt-copy.eclass +++ b/eclass/qt4-qt-copy.eclass @@ -16,6 +16,9 @@ inherit eutils multilib toolchain-funcs flag-o-matic subversion qt4-build IUSE="${IUSE} +qt-copy" +DEPEND="${DEPEND} + qt-copy? ( app-arch/lzma-utils )" + if [[ -n ${QT_COPY_SNAP} ]]; then SRC_URI="${SRC_URI} qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )" @@ -53,7 +56,9 @@ qt4_qt-copy() { ;; esac else - EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" + echo lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma | tar --no-same-owner -xf - + lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma | tar --no-same-owner -xf - + EPATCH_SOURCE="${S}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" fi EPATCH_SUFFIX="diff" epatch } diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 3a52461..9a1958c 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -26,8 +26,8 @@ DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 SHA1 265fb56ded2e7ff101ebd722bd2bc1638f96057d SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276 DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 -EBUILD qt-3.3.8-r4.ebuild 12261 RMD160 5ce1222054db6042c43fd93dc0ffb8aed9596620 SHA1 33f00ec2109673c10fd8d20f8365e8f7522d4c91 SHA256 33a253de7114c385613695662ca5926e60214b8b9505cca91cd8ab4898e3ec56 -EBUILD qt-4.3.2-r1.ebuild 9354 RMD160 b62b9422658f65a6a671adb9628ff7a73e6fc509 SHA1 5ce821cad03453755c961051ca467ff82c923fae SHA256 f4a710cf13b3199839497ac70471bf509e80d236d4f0eccf50683ec338f518a2 -EBUILD qt-4.3.3.ebuild 9278 RMD160 d999cf6cec7a1e4e22573ce429a7e7c0afcb99d6 SHA1 184af3af8a8b1bf12f49dabd185bad30cc290520 SHA256 0c261fd79c6110f56bcaff9556f16ee42b2bfb9e48776a61a0fd9d61f5dc43f4 -EBUILD qt-4.3.4-r1.ebuild 9580 RMD160 3a39d03bdbd998c1b03404365cc4bbe51487b1de SHA1 86fe152fc487564f0950709b21f6119e6bd3db03 SHA256 48bdd2cd04c098718976a44a946f8f5b3a3db3262ba4379acdaf5e2cba878578 +EBUILD qt-3.3.8-r4.ebuild 12274 RMD160 481db97b099847e0c2b82bb92d31ee8399398df7 SHA1 dc303b84d885269039aedd9c66bbfa1a8c5af099 SHA256 09c6269d13da3f9a9430975ffa9cd015be0f1833ee5335b62a78555e82d78c4d +EBUILD qt-4.3.2-r1.ebuild 9367 RMD160 a5bc55e0516ecdc07bd56680fdb0d1f0a68a2cf4 SHA1 c1e3e017e998b4abbf702d83f3b888b8b0b479a3 SHA256 f725f1b0559d2f3359bcfd0ff00724e518459c79156ccf834661bf05fbcaddb5 +EBUILD qt-4.3.3.ebuild 9291 RMD160 e1483cbd359e7bee499e0f1ab1bdb7f8a456f52d SHA1 5bc335a1c890d8813fb7fd024a6028596a85ca91 SHA256 18723ba276cad71cf62f94c53763fee52c1f6ee2637d49fefc50a0858c51a2d7 +EBUILD qt-4.3.4-r1.ebuild 9593 RMD160 7f95386b0175b183310a4ba378d600faad4342a0 SHA1 40d9af379f530d6867a7c6df4ad139229f7ad69e SHA256 6555bac59d9a42f111e355abf992c02e9c9f0d7f2b0a944e5083830b2fc703e8 EBUILD qt-4.4.0_rc1.ebuild 746 RMD160 b25a6145ec05b08c87f2c1ec32d67bc8c739666d SHA1 2536fd111d09aab3ce29a8caa5f84f57f6c8eb6c SHA256 bd9b27ef5ac177d884d0fa2ef801c6f6093470d2a4913bc465f73bcfea38d0d4 diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild index 4de907f..b257c39 100644 --- a/x11-libs/qt/qt-3.3.8-r4.ebuild +++ b/x11-libs/qt/qt-3.3.8-r4.ebuild @@ -47,7 +47,7 @@ DEPEND="x11-libs/libXcursor postgres? ( dev-db/libpq ) cups? ( net-print/cups )" RDEPEND="${DEPEND} - app-arch/lzma-utils" + qt-copy? ( app-arch/lzma-utils )" PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild index db19014..9cefdcb 100644 --- a/x11-libs/qt/qt-4.3.2-r1.ebuild +++ b/x11-libs/qt/qt-4.3.2-r1.ebuild @@ -53,7 +53,7 @@ RDEPEND="x11-libs/libXrandr input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND="${RDEPEND} - app-arch/lzma-utils + qt-copy? ( app-arch/lzma-utils ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/inputproto diff --git a/x11-libs/qt/qt-4.3.3.ebuild b/x11-libs/qt/qt-4.3.3.ebuild index 28f2b31..46082d0 100644 --- a/x11-libs/qt/qt-4.3.3.ebuild +++ b/x11-libs/qt/qt-4.3.3.ebuild @@ -53,7 +53,7 @@ RDEPEND="x11-libs/libXrandr input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND="${RDEPEND} - app-arch/lzma-utils + qt-copy? ( app-arch/lzma-utils ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/inputproto diff --git a/x11-libs/qt/qt-4.3.4-r1.ebuild b/x11-libs/qt/qt-4.3.4-r1.ebuild index 5fa64ec..6f13d84 100644 --- a/x11-libs/qt/qt-4.3.4-r1.ebuild +++ b/x11-libs/qt/qt-4.3.4-r1.ebuild @@ -55,7 +55,7 @@ RDEPEND="x11-libs/libXrandr input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND="${RDEPEND} - app-arch/lzma-utils + qt-copy? ( app-arch/lzma-utils ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/inputproto -- 2.11.4.GIT