add in 4.2.0_rc1, remove 4.2.0_pre1

Package-Manager: portage-2.1.1_rc1-r1

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index e1e90da0d81cbe6b72df08ac0f2eecfabd675650..6b1934c2023ce39c6e7683cba53ea6c49ec7d1af 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -93,7 +93,7 @@ DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e4
 DIST qt-x11-opensource-src-4.1.2.tar.gz 27924277 RMD160 b4a0031a7c8d72492d8afa1a1190493999cb17ff SHA1 a30ff8594b816528ab08ebcf349a31e244c4278d SHA256 025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3
 DIST qt-x11-opensource-src-4.1.3.tar.gz 32200887 RMD160 ecd103f99b2d1ca4b88e749faee5553b8c1c53e2 SHA1 6728b4891c5e24d4a9e1b7b66cc5915f89453b7c SHA256 1323af63fcb0b8aef52b90a6a2b81dbe1d7d929ba3ef02209940536c3ec06143
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
-DIST qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691 RMD160 97de87d0067a20e1cd9f864b2fe4f6d420f77cdb SHA1 0297fc09be7759f9f2a2d2fb8d1a5b08e90394a1 SHA256 2b9a36053f14ae860600375408526fcb26c0ee2c024ad370fa36c21b86ef3d7d
+DIST qt-x11-opensource-src-4.2.0-rc1.tar.gz 36935130 RMD160 03e8a54e170bf3be3c050833b56a6212bae50c6b SHA1 ea9bbd56b3f3cd6e921f0d495ce46877d9400754 SHA256 061c6071064bc635f783523c6d25138a21683cc14b7564645ab80d51c476248c
 EBUILD qt-3.3.4-r8.ebuild 10575 RMD160 14c1f5f8e1efdc0254f8f70ede5ef9b1d2821041 SHA1 ea01fcc66f1cfc7a195f490084a942666d475436 SHA256 7559d11cb57df3c0d87f8e77e940b5808d3d93a5d245ff07b2ac656b30cb6f1e
 MD5 110b8569954192ad0d1fb3e14e22eb0d qt-3.3.4-r8.ebuild 10575
 RMD160 14c1f5f8e1efdc0254f8f70ede5ef9b1d2821041 qt-3.3.4-r8.ebuild 10575
@@ -114,14 +114,14 @@ EBUILD qt-4.1.4.ebuild 6439 RMD160 2aee2a0f0abc22fe0a082df9a3cd1a5445e6e9fa SHA1
 MD5 5ac7cd4f220696002715d88623ca25de qt-4.1.4.ebuild 6439
 RMD160 2aee2a0f0abc22fe0a082df9a3cd1a5445e6e9fa qt-4.1.4.ebuild 6439
 SHA256 d8dc04c478ccda4acee1b002a5e5ed9433fc13c14cbb79e54c521980bc1b6c92 qt-4.1.4.ebuild 6439
-EBUILD qt-4.2.0_pre1.ebuild 6762 RMD160 513ed299d2569446d828b9944be27365e1ac003d SHA1 e4e2ce72f9c8740a0ab3ad892e01d47573d3988a SHA256 1a2bd88dd2f2dcc80a67751a616acde40f0b3d975b474265d798af2389b99787
-MD5 6da936209086fa1942928a69fe1c4111 qt-4.2.0_pre1.ebuild 6762
-RMD160 513ed299d2569446d828b9944be27365e1ac003d qt-4.2.0_pre1.ebuild 6762
-SHA256 1a2bd88dd2f2dcc80a67751a616acde40f0b3d975b474265d798af2389b99787 qt-4.2.0_pre1.ebuild 6762
-MISC ChangeLog 13934 RMD160 fa6101b4febb712e221eaeddff0716b517ee4c69 SHA1 e720c7cfa27f608656f19265c562dbf7eefe6d6c SHA256 3a4ab64afd14fe6eeb4b88d19704266858f9771b52d8ce50485a6421edde8d4a
-MD5 d862a59d7746668593ccd95974d1bfe2 ChangeLog 13934
-RMD160 fa6101b4febb712e221eaeddff0716b517ee4c69 ChangeLog 13934
-SHA256 3a4ab64afd14fe6eeb4b88d19704266858f9771b52d8ce50485a6421edde8d4a ChangeLog 13934
+EBUILD qt-4.2.0_rc1.ebuild 6751 RMD160 06cfcc37a71f0518f3a2db29d31910e3a0f69ed4 SHA1 59ce5278972cef9dbee442e2d81a30a56d7c999d SHA256 cedc1b12b7ed0809a93cbd67c7ab0dfb11698c36736c12983fdda01f45a007b2
+MD5 d565480cd2c41ccd20fb5db7dc59db90 qt-4.2.0_rc1.ebuild 6751
+RMD160 06cfcc37a71f0518f3a2db29d31910e3a0f69ed4 qt-4.2.0_rc1.ebuild 6751
+SHA256 cedc1b12b7ed0809a93cbd67c7ab0dfb11698c36736c12983fdda01f45a007b2 qt-4.2.0_rc1.ebuild 6751
+MISC ChangeLog 14095 RMD160 5052d93676e6ac796f1c897534acca45f0ac7451 SHA1 73b3cf194f54cfdf453a1b5ca50749c9c2b495f3 SHA256 3d3b15050e8a8c97c78fde9ddc7a2a3e1c69396d0d63ceb6d65018180ff8566a
+MD5 98b8d057191944e9cc7c1d2f33af40a6 ChangeLog 14095
+RMD160 5052d93676e6ac796f1c897534acca45f0ac7451 ChangeLog 14095
+SHA256 3d3b15050e8a8c97c78fde9ddc7a2a3e1c69396d0d63ceb6d65018180ff8566a ChangeLog 14095
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -141,6 +141,6 @@ SHA256 eb7e63724f276157c30d19bcfefbbdb6b66faa2be76dd6ce85d4dd454f2e3b57 files/di
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4 289
-MD5 ba18424f299c95580e99ada8f48a3d21 files/digest-qt-4.2.0_pre1 325
-RMD160 f1a57c01d63d0efdcf3a24db1746b6df3f702347 files/digest-qt-4.2.0_pre1 325
-SHA256 d3de2d2c7c04abca2df6e794e03fc2e31f023b7c5036e9fdd9648900fe9ddb3f files/digest-qt-4.2.0_pre1 325
+MD5 ea1cb36339ecc7954be532597c153c79 files/digest-qt-4.2.0_rc1 301
+RMD160 b055b1a3cfaee416de3d615c8b6fff1c9f150b61 files/digest-qt-4.2.0_rc1 301
+SHA256 2ec5ae0152c97cf52bf9a42854f2c202f97b1bf4b3f72c14e30bbd98f2f7352b files/digest-qt-4.2.0_rc1 301

diff --git a/x11-libs/qt/files/digest-qt-4.2.0_pre1 b/x11-libs/qt/files/digest-qt-4.2.0_pre1
deleted file mode 100644 (file)
index 07f1509..0000000
--- a/x11-libs/qt/files/digest-qt-4.2.0_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 099a99d1b72b4be752fe0e211bc32dcf qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691
-RMD160 97de87d0067a20e1cd9f864b2fe4f6d420f77cdb qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691
-SHA256 2b9a36053f14ae860600375408526fcb26c0ee2c024ad370fa36c21b86ef3d7d qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691

diff --git a/x11-libs/qt/qt-4.2.0_pre1.ebuild b/x11-libs/qt/qt-4.2.0_pre1.ebuild
deleted file mode 100644 (file)
index e81b193..0000000
--- a/x11-libs/qt/qt-4.2.0_pre1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.0_pre1.ebuild,v 1.7 2006/08/07 23:07:09 ticho Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV/_pre/-tp}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_pre/-tp}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-#KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="-*"
-IUSE="accessibility cups debug dbus doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres sqlite xinerama zlib"
-
-# need glib and dbus
-
-DEPEND="|| ( ( x11-libs/libXrandr
-                       x11-libs/libXcursor
-                       x11-libs/libXi
-                       x11-libs/libXfont
-                       x11-libs/libSM
-                       x11-proto/xextproto
-                       x11-proto/inputproto
-                       xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-               )
-               <virtual/x11-7
-       )
-       virtual/xft
-       >=media-libs/freetype-2
-       dbus? ( >=sys-apps/dbus-0.62 )
-       png? ( media-libs/libpng )
-       jpeg? ( media-libs/jpeg )
-       mng? ( media-libs/libmng )
-       nas? ( >=media-libs/nas-1.5 )
-       odbc? ( dev-db/unixODBC )
-       mysql? ( dev-db/mysql )
-       firebird? ( dev-db/firebird )
-       opengl? ( virtual/opengl virtual/glu )
-       postgres? ( dev-db/libpq )
-       cups? ( net-print/cups )
-       zlib? ( sys-libs/zlib )
-       glib? ( dev-libs/glib )"
-
-pkg_setup() {
-       QTBASEDIR=/usr/$(get_libdir)/qt4
-       QTPREFIXDIR=/usr
-       QTBINDIR=/usr/bin
-       QTLIBDIR=/usr/$(get_libdir)/qt4
-       QTPCDIR=/usr/$(get_libdir)/pkgconfig
-       QTDATADIR=/usr/share/qt4
-       QTDOCDIR=/usr/share/doc/${PF}
-       QTHEADERDIR=/usr/include/qt4
-       QTPLUGINDIR=${QTLIBDIR}/plugins
-       QTSYSCONFDIR=/etc/qt4
-       QTTRANSDIR=${QTDATADIR}/translations
-       QTEXAMPLESDIR=${QTDATADIR}/examples
-       QTDEMOSDIR=${QTDATADIR}/demos
-
-       PLATFORM=$(qt_mkspecs_dir)
-}
-
-qt_use() {
-       useq ${1} && echo "-${1}" || echo "-no-${1}"
-       return 0
-}
-
-qt_mkspecs_dir() {
-       # Allows us to define which mkspecs dir we want to use.  Currently we only use
-       # linux-g++ or linux-g++-64, but others could be used for various platforms.
-
-       if [[ $(get_libdir) == "lib" ]]; then
-               echo "linux-g++"
-       else
-               echo "linux-g++-64"
-       fi
-}
-
-src_unpack() {
-
-       unpack ${A}
-#      epatch ${FILESDIR}/qt4-parisc-linux.diff
-       cd ${S}
-
-       sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-       cd mkspecs/$(qt_mkspecs_dir)
-       # set c/xxflags and ldflags
-
-       # Don't let the user go too overboard with flags.  If you really want to, uncomment
-       # out the line below and give 'er a whirl.
-       strip-flags
-       replace-flags -O3 -O2
-
-       sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-               -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-               -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-               qmake.conf
-
-       # Do not link with -rpath. See bug #75181.
-       sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \
-               qmake.conf
-
-       # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-       sed -i -e "s:X11R6/::" qmake.conf
-
-       cd ${S}
-
-       if [[ "$(gcc-major-version)" == "4" ]]; then
-               einfo "Visibility support: auto"
-       else
-               einfo "Visibility support: disabled"
-               sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-       fi
-}
-
-src_compile() {
-       export PATH="${S}/bin:${PATH}"
-       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-       [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-       myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
-       myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
-
-       use nas         && myconf="${myconf} -system-nas-sound"
-       use gif         && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
-       use png         && myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
-       use jpeg        && myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
-       use debug       && myconf="${myconf} -debug-and-release" || myconf="${myconf} -release"
-       use zlib        && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
-
-       use mysql       && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
-       use postgres    && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
-       use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
-       use sqlite      && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
-       use odbc        && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-       use dbus        && myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-       use glib        && myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-
-       use pch         && myconf="${myconf} -pch"
-
-       myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
-
-       ./configure -stl -verbose -largefile \
-               -platform ${PLATFORM} -xplatform ${PLATFORM} \
-               -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-               -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-               -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-               -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
-
-       emake sub-tools-all-ordered || die
-       if use examples; then
-               emake sub-examples-all-ordered || die
-       fi
-}
-
-src_install() {
-       export PATH="${S}/bin:${PATH}"
-       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-       make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-
-       if use examples; then
-               make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
-               make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
-       fi
-
-       make INSTALL_ROOT=${D} install_qmake || die
-       make INSTALL_ROOT=${D} install_mkspecs || die
-
-       if use doc; then
-               make INSTALL_ROOT=${D} install_htmldocs || die
-       fi
-
-       # Install the translations.  This may get use flagged later somehow
-       make INSTALL_ROOT=${D} install_translations || die
-
-       # The private header files of QTestLib aren't installed, but are needed by the test library.
-       # This is supposedly fixed in Qt 4.1.1, so this can probably be removed when it is released
-       dodir ${QTHEADERDIR}/QtTest/private
-       cp -pPR ${S}/tools/qtestlib/src/*_p.h ${D}/${QTHEADERDIR}/QtTest/private
-
-       keepdir "${QTSYSCONFDIR}"
-
-       sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
-       sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
-       sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
-       # Move .pc files into the pkgconfig directory
-       dodir ${QTPCDIR}
-       mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
-
-       # List all the multilib libdirs
-       local libdirs
-       for libdir in $(get_all_libdirs); do
-               libdirs="${libdirs}:/usr/${libdir}/qt4"
-       done
-
-       cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-       doenvd "${T}/44qt4"
-}