Remove 4.0 series that was put back for sparc reasons. Now have a 4.1 stable

Package-Manager: portage-2.1.2_pre3-r7

3 files changed, 4 insertions, 204 deletions

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 8b39f4f6aff3..06eebd005674 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -106,7 +106,6 @@ DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a
 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 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.1.tar.gz 37069122 RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 SHA1 ef4d109608ea32d318b009c89f298da3d362e3fb SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4
 EBUILD qt-3.3.4-r8.ebuild 10573 RMD160 9660a11866e6b0bf4203ceb777659201c3e7fcef SHA1 ce65fadc6e904bf74ae629c26838331e6eb95820 SHA256 c2925fcdea720e7ead24a5bf6b2e7b3a085872270002f9622a38f7aefccd75b7
@@ -129,10 +128,6 @@ EBUILD qt-3.3.6-r4.ebuild 11099 RMD160 c9b41ea2b5daebb025e4f5b3b7bfe3662cdc058a
 MD5 37d1a4fa17e5cd1f1c39406655f37695 qt-3.3.6-r4.ebuild 11099
 RMD160 c9b41ea2b5daebb025e4f5b3b7bfe3662cdc058a qt-3.3.6-r4.ebuild 11099
 SHA256 c5ec24c0014cd51831cbc5d24afb889f20d09295ddf41aaa8bac415477987c82 qt-3.3.6-r4.ebuild 11099
-EBUILD qt-4.0.1.ebuild 5926 RMD160 4403976a13e9f9f5f53017b1f9c4c6b1f8d5b5a8 SHA1 f2ea6905e2112829e3b72ab15b34b567cade273b SHA256 4e4f2bea1dace6368d79b3d11d5fdaa937571ca33a9efcb0fbf6b5186d7039d5
-MD5 90c09342512c6e13f8e2ae2fc451c3de qt-4.0.1.ebuild 5926
-RMD160 4403976a13e9f9f5f53017b1f9c4c6b1f8d5b5a8 qt-4.0.1.ebuild 5926
-SHA256 4e4f2bea1dace6368d79b3d11d5fdaa937571ca33a9efcb0fbf6b5186d7039d5 qt-4.0.1.ebuild 5926
 EBUILD qt-4.1.4-r1.ebuild 6851 RMD160 b2703d62a9dffde0af614c68b7b115734bf5e2b6 SHA1 27e0dd83b733f2b00d5ede830f00c23cf6214522 SHA256 54f0a7f304cf1c242080fa715007547343f816af22f1adfbd526331078a452b2
 MD5 8cb5564e06564035e498cdfe89bead28 qt-4.1.4-r1.ebuild 6851
 RMD160 b2703d62a9dffde0af614c68b7b115734bf5e2b6 qt-4.1.4-r1.ebuild 6851
@@ -149,10 +144,10 @@ EBUILD qt-4.2.1.ebuild 6949 RMD160 cef3ad5ea8cac06306ba27a87ca6512943bca93a SHA1
 MD5 11619f398a5906b70241db6da7532115 qt-4.2.1.ebuild 6949
 RMD160 cef3ad5ea8cac06306ba27a87ca6512943bca93a qt-4.2.1.ebuild 6949
 SHA256 68aeb8ade5b222fea8bed1721b7a59b3b324b2d7bd70bc2925c0ba0a3b35c7a2 qt-4.2.1.ebuild 6949
-MISC ChangeLog 19368 RMD160 cc2631969568dee9fdbc5343a03bcca2398bf44c SHA1 a42e14869bcb73311f029acdc72523d20047832c SHA256 1cfebe9ae9f19750fed951d091b664ccee4c5c15e2bf6bb4af48b415dc645615
-MD5 012a3ee1b2161807fe168620e23f5f7e ChangeLog 19368
-RMD160 cc2631969568dee9fdbc5343a03bcca2398bf44c ChangeLog 19368
-SHA256 1cfebe9ae9f19750fed951d091b664ccee4c5c15e2bf6bb4af48b415dc645615 ChangeLog 19368
+MISC ChangeLog 19514 RMD160 1cd164acb916596bfb19328acb938a47e68e0bbd SHA1 ba5214db24735114dcacda008a1bbb8c69f4b7ff SHA256 ea0cbac4604ddf89f422a3a03908cb22f39cff5dddc47ca85799c9d81d0262ba
+MD5 f80fc3e5992928d9fd54a6f8eb7bbc88 ChangeLog 19514
+RMD160 1cd164acb916596bfb19328acb938a47e68e0bbd ChangeLog 19514
+SHA256 ea0cbac4604ddf89f422a3a03908cb22f39cff5dddc47ca85799c9d81d0262ba ChangeLog 19514
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -172,9 +167,6 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di
 MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r4 611
 RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r4 611
 SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r4 611
-MD5 5eb6bb64b8317c80bc0329c305360051 files/digest-qt-4.0.1 289
-RMD160 0c60b1444c62cf8510092270b70c35d9a7e2e6a2 files/digest-qt-4.0.1 289
-SHA256 7011458697a6b1bac72f600a9cfb16250ced3738fa0a6bc15fef3321ce2c6fe1 files/digest-qt-4.0.1 289
 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
diff --git a/x11-libs/qt/files/digest-qt-4.0.1 b/x11-libs/qt/files/digest-qt-4.0.1
deleted file mode 100644
index 40b192924350..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz 20141717
-RMD160 8a53a22c08ca5a31194bf5bc69cf86b7193dc95a qt-x11-opensource-src-4.0.1.tar.gz 20141717
-SHA256 f52ff20671848bbfe34f5db493a60c1ef4e914b268237cba040418f31628dad6 qt-x11-opensource-src-4.0.1.tar.gz 20141717
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
deleted file mode 100644
index 167b33a12d7b..000000000000
--- a/x11-libs/qt/qt-4.0.1.ebuild
+++ /dev/null
@@ -1,189 +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.0.1.ebuild,v 1.18 2006/09/22 17:42:59 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/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~sparc"
-IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
-
-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
-	)
-	virtual/xft
-	>=media-libs/freetype-2
-	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/postgresql )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )"
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr/$(get_libdir)/qt4
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTDATADIR=/usr/share/doc/${PF}
-	QTDOCDIR=${QTDATADIR}/doc
-	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}
-	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
-	cd ${S}
-
-	epatch ${FILESDIR}/qt4-nomkdir.patch
-
-	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"
-
-	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
-
-	# The QtAssistant header files aren't installed..not sure why
-	cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
-
-	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
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat > "${T}/44qt4" << EOF
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}