From 1cf9c730c604d83e194314a1eef3a1cf4c6ac625 Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Mon, 14 Apr 2008 04:17:53 +0200 Subject: [PATCH] =?utf8?q?=C3=B9=20Make=20use=20of=20EAPI=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- x11-libs/qt/Manifest | 8 ++--- x11-libs/qt/qt-3.3.8-r4.ebuild | 52 +++++++++++++++--------------- x11-libs/qt/qt-4.3.2-r1.ebuild | 71 +++++++++++++++++++++-------------------- x11-libs/qt/qt-4.3.3.ebuild | 71 +++++++++++++++++++++-------------------- x11-libs/qt/qt-4.3.4-r1.ebuild | 72 +++++++++++++++++++++--------------------- 5 files changed, 138 insertions(+), 136 deletions(-) diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 0257925..31d8fd4 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -26,7 +26,7 @@ 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 12245 RMD160 9e89c7494222941e05c2b28b514c9b025d80f813 SHA1 0a0b4a90dc13a3dd5db9082b171b9212ffad9b92 SHA256 1910ababd7ba670358e937d9295c25e3d759f97422bccec732d10004bfdbb38d -EBUILD qt-4.3.2-r1.ebuild 9140 RMD160 1f69f6cda5d52c8ae3d48e70682248eff72daea1 SHA1 45337b11f2048032bb9caf4b1e137b2a36c3f794 SHA256 867463fd0750d29f5ce6223d1a27e4d1f984c8505f37ba290a3c2720eb6565e7 -EBUILD qt-4.3.3.ebuild 9072 RMD160 986cc117d98b6df0e45e84531c8e1522c107a0b8 SHA1 ac4b58c7c922169d62fb7ca739fec882af4ab3f4 SHA256 1d47fb0b49648744e9dea10fa7ad634fd3d346b9ef2ed0395ff1108f41dc4d5f -EBUILD qt-4.3.4-r1.ebuild 9390 RMD160 a3a102ecfdad925906ab8aedd23ec66f8708b4a6 SHA1 dcd8403b7700477017a1d1f84e20ea68cd82ed27 SHA256 c41b0a5ceee60cdb7242f2b2a7c4ca86894b8366a302feaa1e9d9be19e2414b3 +EBUILD qt-3.3.8-r4.ebuild 12218 RMD160 bb01dba20c92f797b958778c890d6b30682b693c SHA1 0ae3f7d8f5ede6d9084dc65a72a7ad59174267fc SHA256 40d2c085c1ea0b1f91ce9d93bdf75f04286840ac8cb020dfdb79899de3bd5e3f +EBUILD qt-4.3.2-r1.ebuild 9187 RMD160 8f415763d9bbbbbf90664cee774bea61e847e7c2 SHA1 f9d3e292ab476ded550ff7a6d1951f203feb4fbe SHA256 977a954dc7ead8cf5f7ee35dd47332e1d8485f7a4b5cd9ace1e7b940578bea04 +EBUILD qt-4.3.3.ebuild 9119 RMD160 996b74066c3ee34b4e35aebc49e6ae2027c6753c SHA1 06f9f74b8bb502ea60ec4996717c5326fefe9e2c SHA256 39ec5251480a5d7769b5ac93060a335ec86411ee1382331727eb09fbfc241c2f +EBUILD qt-4.3.4-r1.ebuild 9421 RMD160 e575508e6c7050a055f7d371bf2c73911d75eb64 SHA1 b4091e9095808d4a7a90cf9966a781b6796e26df SHA256 fe82c8670904313aebe3066081208f5cc36397a6749ca9cf2d0a04c7727f8a8b diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild index baf1e19..eb95f1c 100644 --- a/x11-libs/qt/qt-3.3.8-r4.ebuild +++ b/x11-libs/qt/qt-3.3.8-r4.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -# *** Please remember to update qt3.eclass when revbumping this *** - +EAPI="1" inherit eutils flag-o-matic toolchain-funcs SRCTYPE="free" @@ -26,28 +25,29 @@ SLOT="3" KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres qt-copy sqlite xinerama immqt immqt-bc" -DEPEND="app-arch/lzma-utils - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libSM - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) - immqt? ( x11-proto/xineramaproto ) - immqt-bc? ( x11-proto/xineramaproto ) - virtual/xft - media-libs/libpng - media-libs/jpeg - >=media-libs/libmng-1.0.9 - >=media-libs/freetype-2 - sys-libs/zlib - nas? ( >=media-libs/nas-1.5 ) - mysql? ( virtual/mysql ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/libpq ) - cups? ( net-print/cups )" +DEPEND="x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + immqt? ( x11-proto/xineramaproto ) + immqt-bc? ( x11-proto/xineramaproto ) + virtual/xft + media-libs/libpng + media-libs/jpeg + >=media-libs/libmng-1.0.9 + media-libs/freetype:2 + sys-libs/zlib + nas? ( >=media-libs/nas-1.5 ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups )" +RDEPEND="${DEPEND} + app-arch/lzma-utils" PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} @@ -155,9 +155,9 @@ src_unpack() { fi # Apply QT Copy patches: - if use qt-copy ; then + if use qt-copy; then EPATCH_MULTI_MSG="Applying the KDE Qt Copy patches ..." \ - EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch + EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch fi # known working flags wrt #77623 diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild index 9ad92c2..0f5ddb2 100644 --- a/x11-libs/qt/qt-4.3.2-r1.ebuild +++ b/x11-libs/qt/qt-4.3.2-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: Exp $ +EAPI="1" inherit eutils flag-o-matic toolchain-funcs multilib SRCTYPE="opensource-src" @@ -22,41 +23,41 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE_INPUT_DEVICES="input_devices_wacom" -IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt-copy qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" - -RDEPEND="app-arch/lzma-utils - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - !x11-libs/qt-core - xinerama? ( x11-libs/libXinerama ) - media-libs/fontconfig - >=media-libs/freetype-2 - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - mng? ( >=media-libs/libmng-1.0.9 ) - tiff? ( media-libs/tiff ) - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( virtual/mysql ) - firebird? ( dev-db/firebird ) - sqlite3? ( =dev-db/sqlite-3* ) - sqlite? ( =dev-db/sqlite-2* ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/libpq ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib ) - glib? ( dev-libs/glib ) - dbus? ( >=sys-apps/dbus-1.0.2 ) - ssl? ( dev-libs/openssl ) - input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" +IUSE="+accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres +qt-copy +qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" + +RDEPEND="x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXfont + x11-libs/libSM + !x11-libs/qt-core + xinerama? ( x11-libs/libXinerama ) + media-libs/fontconfig + media-libs/freetype:2 + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + mng? ( >=media-libs/libmng-1.0.9 ) + tiff? ( media-libs/tiff ) + nas? ( >=media-libs/nas-1.5 ) + odbc? ( dev-db/unixODBC ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + sqlite3? ( dev-db/sqlite:3 ) + sqlite? ( dev-db/sqlite:0 ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups ) + zlib? ( sys-libs/zlib ) + glib? ( dev-libs/glib ) + dbus? ( >=sys-apps/dbus-1.0.2 ) + ssl? ( dev-libs/openssl ) + input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND="${RDEPEND} - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xextproto - x11-proto/inputproto - dev-util/pkgconfig" + app-arch/lzma-utils + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/inputproto + dev-util/pkgconfig" pkg_setup() { QTBASEDIR=/usr/$(get_libdir)/qt4 @@ -129,9 +130,9 @@ src_unpack() { epatch "${FILESDIR}"/qsslsocket-fix.patch # Apply QT Copy patches: - if use qt-copy ; then + if use qt-copy; then EPATCH_MULTI_MSG="Applying the KDE Qt Copy patches ..." \ - EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch + EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch fi cd "${S}"/mkspecs/$(qt_mkspecs_dir) diff --git a/x11-libs/qt/qt-4.3.3.ebuild b/x11-libs/qt/qt-4.3.3.ebuild index 9ebe327..75581e9 100644 --- a/x11-libs/qt/qt-4.3.3.ebuild +++ b/x11-libs/qt/qt-4.3.3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="1" inherit eutils flag-o-matic toolchain-funcs multilib SRCTYPE="opensource-src" @@ -22,41 +23,41 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE_INPUT_DEVICES="input_devices_wacom" -IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt-copy qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" - -RDEPEND="app-arch/lzma-utils - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - !x11-libs/qt-core - xinerama? ( x11-libs/libXinerama ) - media-libs/fontconfig - >=media-libs/freetype-2 - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - mng? ( >=media-libs/libmng-1.0.9 ) - tiff? ( media-libs/tiff ) - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( virtual/mysql ) - firebird? ( dev-db/firebird ) - sqlite3? ( =dev-db/sqlite-3* ) - sqlite? ( =dev-db/sqlite-2* ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/libpq ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib ) - glib? ( dev-libs/glib ) - dbus? ( >=sys-apps/dbus-1.0.2 ) - ssl? ( dev-libs/openssl ) - input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" +IUSE="+accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres +qt-copy +qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" + +RDEPEND="x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXfont + x11-libs/libSM + !x11-libs/qt-core + xinerama? ( x11-libs/libXinerama ) + media-libs/fontconfig + media-libs/freetype:2 + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + mng? ( >=media-libs/libmng-1.0.9 ) + tiff? ( media-libs/tiff ) + nas? ( >=media-libs/nas-1.5 ) + odbc? ( dev-db/unixODBC ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + sqlite3? ( dev-db/sqlite:3 ) + sqlite? ( dev-db/sqlite:0 ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups ) + zlib? ( sys-libs/zlib ) + glib? ( dev-libs/glib ) + dbus? ( >=sys-apps/dbus-1.0.2 ) + ssl? ( dev-libs/openssl ) + input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND="${RDEPEND} - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xextproto - x11-proto/inputproto - dev-util/pkgconfig" + app-arch/lzma-utils + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/inputproto + dev-util/pkgconfig" pkg_setup() { QTBASEDIR=/usr/$(get_libdir)/qt4 @@ -127,9 +128,9 @@ src_unpack() { epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch # Apply QT Copy patches: - if use qt-copy ; then + if use qt-copy; then EPATCH_MULTI_MSG="Applying the KDE Qt Copy patches ..." \ - EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch + EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch fi cd "${S}"/mkspecs/$(qt_mkspecs_dir) diff --git a/x11-libs/qt/qt-4.3.4-r1.ebuild b/x11-libs/qt/qt-4.3.4-r1.ebuild index 0cb46b2..6ae55e9 100644 --- a/x11-libs/qt/qt-4.3.4-r1.ebuild +++ b/x11-libs/qt/qt-4.3.4-r1.ebuild @@ -13,8 +13,8 @@ HOMEPAGE="http://www.trolltech.com/" RESTRICT="primaryuri" SRC_URI="mirror://gentoo/qt-x11-${SRCTYPE}-${PV}.tar.gz - ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz - qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )" + ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz + qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )" S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" @@ -24,42 +24,42 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE_INPUT_DEVICES="input_devices_wacom" IUSE="+accessibility cups dbus debug doc examples firebird gif glib jpeg mng -mysql nas nis odbc opengl pch png postgres +qt3support qt-copy sqlite sqlite3 ssl tiff +mysql nas nis odbc opengl pch png postgres +qt3support +qt-copy sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" -RDEPEND="app-arch/lzma-utils - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - !x11-libs/qt-core - xinerama? ( x11-libs/libXinerama ) - media-libs/fontconfig - >=media-libs/freetype-2 - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - mng? ( >=media-libs/libmng-1.0.9 ) - tiff? ( media-libs/tiff ) - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( virtual/mysql ) - firebird? ( dev-db/firebird ) - sqlite3? ( =dev-db/sqlite-3* ) - sqlite? ( =dev-db/sqlite-2* ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/libpq ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib ) - glib? ( dev-libs/glib ) - dbus? ( >=sys-apps/dbus-1.0.2 ) - ssl? ( dev-libs/openssl ) - input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" +RDEPEND="x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXfont + x11-libs/libSM + !x11-libs/qt-core + xinerama? ( x11-libs/libXinerama ) + media-libs/fontconfig + media-libs/freetype:2 + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + mng? ( >=media-libs/libmng-1.0.9 ) + tiff? ( media-libs/tiff ) + nas? ( >=media-libs/nas-1.5 ) + odbc? ( dev-db/unixODBC ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + sqlite3? ( dev-db/sqlite:3 ) + sqlite? ( dev-db/sqlite:0 ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups ) + zlib? ( sys-libs/zlib ) + glib? ( dev-libs/glib ) + dbus? ( >=sys-apps/dbus-1.0.2 ) + ssl? ( dev-libs/openssl ) + input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND="${RDEPEND} - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xextproto - x11-proto/inputproto - dev-util/pkgconfig" + app-arch/lzma-utils + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/inputproto + dev-util/pkgconfig" pkg_setup() { QTBASEDIR=/usr/$(get_libdir)/qt4 @@ -130,9 +130,9 @@ src_unpack() { epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch # Apply QT Copy patches: - if use qt-copy ; then + if use qt-copy; then EPATCH_MULTI_MSG="Applying the KDE Qt Copy patches ..." \ - EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch + EPATCH_SOURCE="${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}" EPATCH_SUFFIX="diff" epatch fi cd "${S}"/mkspecs/$(qt_mkspecs_dir) -- 2.11.4.GIT