remove _rc1

Package-Manager: portage-2.1.2_pre1

3 files changed, 4 insertions, 222 deletions

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 5c5b02b6eb51..4328fe24255f 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -92,7 +92,6 @@ DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b2
 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
 DIST qt-x11-opensource-src-4.0.1.tar.gz 20141717 RMD160 8a53a22c08ca5a31194bf5bc69cf86b7193dc95a SHA1 dcef02d681b0a9d6abacdc2a3f561e628b3ff8c8 SHA256 f52ff20671848bbfe34f5db493a60c1ef4e914b268237cba040418f31628dad6
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
-DIST qt-x11-opensource-src-4.2.0-rc1.tar.gz 36935130 RMD160 03e8a54e170bf3be3c050833b56a6212bae50c6b SHA1 ea9bbd56b3f3cd6e921f0d495ce46877d9400754 SHA256 061c6071064bc635f783523c6d25138a21683cc14b7564645ab80d51c476248c
 DIST qt-x11-opensource-src-4.2.0.tar.gz 37084418 RMD160 d9825a32fcfd495bf61316b4ee346a78ef5cc4f8 SHA1 b878d21cd6844261feb97a0a7a813160bf475596 SHA256 80abfeca291291ee4647c13fcd113741b98accb0205361cb2b18a914f4c0caba
 EBUILD qt-3.3.4-r8.ebuild 10573 RMD160 9660a11866e6b0bf4203ceb777659201c3e7fcef SHA1 ce65fadc6e904bf74ae629c26838331e6eb95820 SHA256 c2925fcdea720e7ead24a5bf6b2e7b3a085872270002f9622a38f7aefccd75b7
 MD5 877a3cc6c39fccd65c18afffe30bf899 qt-3.3.4-r8.ebuild 10573
@@ -118,14 +117,10 @@ EBUILD qt-4.2.0.ebuild 6723 RMD160 60be1f9bc5c984991a2ec910fca9a8637af64dd6 SHA1
 MD5 979044188f173c1c3d51253ca68b1b5a qt-4.2.0.ebuild 6723
 RMD160 60be1f9bc5c984991a2ec910fca9a8637af64dd6 qt-4.2.0.ebuild 6723
 SHA256 5435f43d6dedf6e5d6cf5ff643368e534c7de9cff64a79fd033a0b7624c8a267 qt-4.2.0.ebuild 6723
-EBUILD qt-4.2.0_rc1.ebuild 6706 RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 SHA1 f99cbaf0f3a2fae7690e40e37624c84d58756d70 SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253
-MD5 427399b875cf9a84de35c3faee3b757b qt-4.2.0_rc1.ebuild 6706
-RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 qt-4.2.0_rc1.ebuild 6706
-SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253 qt-4.2.0_rc1.ebuild 6706
-MISC ChangeLog 15539 RMD160 43751dae2a1c8fb992cc50abfab7d62d901e471d SHA1 a1363855a21a5303b6683161a3b6114fcabb3533 SHA256 30dd44e6f0e616c932813a34035ff94cd542d29f2dc808c486303701dba71afe
-MD5 968d37d1ab223ada2b970f2247113589 ChangeLog 15539
-RMD160 43751dae2a1c8fb992cc50abfab7d62d901e471d ChangeLog 15539
-SHA256 30dd44e6f0e616c932813a34035ff94cd542d29f2dc808c486303701dba71afe ChangeLog 15539
+MISC ChangeLog 15623 RMD160 293611524ebee8abe45e85cacbc5951955435a04 SHA1 0a42e14f58a25513196c2c0c462de792246df121 SHA256 728f8839cdc5fb7313947b3acffef408d8d18e8fcbb31700e7e17fcac4d368d8
+MD5 ed8f7d251ccc05d99cd7aaacc26826b7 ChangeLog 15623
+RMD160 293611524ebee8abe45e85cacbc5951955435a04 ChangeLog 15623
+SHA256 728f8839cdc5fb7313947b3acffef408d8d18e8fcbb31700e7e17fcac4d368d8 ChangeLog 15623
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -148,6 +143,3 @@ SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/di
 MD5 5e109af042c3b83d33c4a304be0f8d63 files/digest-qt-4.2.0 289
 RMD160 eb77294b503d2d82af015e1862e2b369f1e734b3 files/digest-qt-4.2.0 289
 SHA256 484890bc2ce09ed34c34b113ab438a095628bf41241f77ff1a0eed79c6ff08f3 files/digest-qt-4.2.0 289
-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_rc1 b/x11-libs/qt/files/digest-qt-4.2.0_rc1
deleted file mode 100644
index 3676b4f85408..000000000000
--- a/x11-libs/qt/files/digest-qt-4.2.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 abea80e4ec7fe232db63c125c74e917d qt-x11-opensource-src-4.2.0-rc1.tar.gz 36935130
-RMD160 03e8a54e170bf3be3c050833b56a6212bae50c6b qt-x11-opensource-src-4.2.0-rc1.tar.gz 36935130
-SHA256 061c6071064bc635f783523c6d25138a21683cc14b7564645ab80d51c476248c qt-x11-opensource-src-4.2.0-rc1.tar.gz 36935130
diff --git a/x11-libs/qt/qt-4.2.0_rc1.ebuild b/x11-libs/qt/qt-4.2.0_rc1.ebuild
deleted file mode 100644
index 4484f78b2e2b..000000000000
--- a/x11-libs/qt/qt-4.2.0_rc1.ebuild
+++ /dev/null
@@ -1,207 +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_rc1.ebuild,v 1.2 2006/09/14 14:07:54 caleb Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="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/_rc/-rc}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_rc/-rc}
-
-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/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"
-}