remove last of 4.2 series

Package-Manager: portage-2.1.3.6

4 files changed, 8 insertions, 263 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index b3738970e858..3956a21b4ec8 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.479 2007/08/23 22:51:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.480 2007/08/23 22:53:30 caleb Exp $
+
+  23 Aug 2007; Caleb Tennis <caleb@gentoo.org> -qt-4.2.3-r1.ebuild:
+  remove last of 4.2 series
 
   23 Aug 2007; Markus Rothe <corsair@gentoo.org>
   +files/qt-4.3.1-powerpc64.patch, qt-4.3.1.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index e4596c118640..57218736f90c 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -130,7 +130,6 @@ DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a
 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
-DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
 DIST qt-x11-opensource-src-4.3.0.tar.gz 41955515 RMD160 2106dd8dda7a5b16305ba701e33c17e9349fddc3 SHA1 e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4 SHA256 abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
 DIST qt-x11-opensource-src-4.3.1.tar.gz 43118858 RMD160 134c1f1a9e685a9519ff88a3afc59e7b8329a270 SHA1 ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2 SHA256 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661
 EBUILD qt-3.3.4-r8.ebuild 10399 RMD160 3a63653870caa0ad2e0c10a4eaacc184ded66ef0 SHA1 300d978362f3cdfd98fe6c4a1bd323a078fae530 SHA256 71731b73f95aaaea0efd925ee3daeafa35501d0c6a77c13bbfaf0537084b97d7
@@ -141,10 +140,6 @@ EBUILD qt-3.3.8-r3.ebuild 11362 RMD160 47cf320285a4f5a664580f50e792277058e23f2e
 MD5 7d07fc7a446b7538da4c060ed608812b qt-3.3.8-r3.ebuild 11362
 RMD160 47cf320285a4f5a664580f50e792277058e23f2e qt-3.3.8-r3.ebuild 11362
 SHA256 a34866c42614152e8f5911a535f61c792fe3889f7d2b45efd848e2c6b4b63822 qt-3.3.8-r3.ebuild 11362
-EBUILD qt-4.2.3-r1.ebuild 7851 RMD160 120c059c69277e0b86e06cc1dd8d669d17b50981 SHA1 aff1b2f55ff6080ad5a560a954ef62fc70ad79ab SHA256 73d49b40bd1f533358269b68e4fac42553477b6b06ea054629bb3d5bef35ea20
-MD5 f43c53e05ee8c1f1bd1b0a465adf0a0b qt-4.2.3-r1.ebuild 7851
-RMD160 120c059c69277e0b86e06cc1dd8d669d17b50981 qt-4.2.3-r1.ebuild 7851
-SHA256 73d49b40bd1f533358269b68e4fac42553477b6b06ea054629bb3d5bef35ea20 qt-4.2.3-r1.ebuild 7851
 EBUILD qt-4.3.0-r2.ebuild 8582 RMD160 14df6dc4315f6e6cf0be22f3c3dfc6782c7bc029 SHA1 40a9df27bd37c9b0095f43ef9f6fb95295a9de51 SHA256 ce33fb10c43df55677a20fa1d9051df9f1159be29187264f3c05fbaa555ce688
 MD5 4ffd7c244649b98832482f896e25eba0 qt-4.3.0-r2.ebuild 8582
 RMD160 14df6dc4315f6e6cf0be22f3c3dfc6782c7bc029 qt-4.3.0-r2.ebuild 8582
@@ -153,10 +148,10 @@ EBUILD qt-4.3.1.ebuild 8591 RMD160 545b9d537e8d2efdfa700880ebee61f2323a96ff SHA1
 MD5 2ba0800a6ae9dbf31225701a9d844ecd qt-4.3.1.ebuild 8591
 RMD160 545b9d537e8d2efdfa700880ebee61f2323a96ff qt-4.3.1.ebuild 8591
 SHA256 c0793eb315c39bf80ff7b81664cf951dc7e3ff7276823743a0f8a2f5746d880b qt-4.3.1.ebuild 8591
-MISC ChangeLog 33442 RMD160 5c6416598a1a8c030b541eff183a3864cad57f4d SHA1 b5a84a367a1b88f12229596b1cb1a7e1c6575e44 SHA256 8707be33e4744ad8f52ef2a662da4f0e05bd8448167e9e3c3e7c7faa6dbe35c4
-MD5 18ac75a11d6f53ab437cc07ce5b84500 ChangeLog 33442
-RMD160 5c6416598a1a8c030b541eff183a3864cad57f4d ChangeLog 33442
-SHA256 8707be33e4744ad8f52ef2a662da4f0e05bd8448167e9e3c3e7c7faa6dbe35c4 ChangeLog 33442
+MISC ChangeLog 33539 RMD160 618205c0d2d95c676d1b93f58d049e954c7582ae SHA1 a356dca0f5852448ec2a37bb2fc9fd9a5708005e SHA256 fcf318e91c8db48adcc6efc58b06b4374e6fd3dcd1428f1be17bb15e5e4ea34c
+MD5 620283df348a9cda7134e2b58e7fd8c6 ChangeLog 33539
+RMD160 618205c0d2d95c676d1b93f58d049e954c7582ae ChangeLog 33539
+SHA256 fcf318e91c8db48adcc6efc58b06b4374e6fd3dcd1428f1be17bb15e5e4ea34c ChangeLog 33539
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -167,9 +162,6 @@ SHA256 ff67af4e95cf1dbfcf39a908b99339305f6cf0031c9e325298fe6f742ec050c0 files/di
 MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8-r3 608
 RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8-r3 608
 SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8-r3 608
-MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3-r1 289
-RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3-r1 289
-SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3-r1 289
 MD5 05b5810e7294f4c2b36c1baf6ec434b9 files/digest-qt-4.3.0-r2 289
 RMD160 4941b905c8bc924967401226882e1003b7ebca32 files/digest-qt-4.3.0-r2 289
 SHA256 d690f3feb8a1a5b623ab75eb2cf2e91338fd01d5a0e386282d9b549c4af1daf9 files/digest-qt-4.3.0-r2 289
diff --git a/x11-libs/qt/files/digest-qt-4.2.3-r1 b/x11-libs/qt/files/digest-qt-4.2.3-r1
deleted file mode 100644
index c9542fb218d2..000000000000
--- a/x11-libs/qt/files/digest-qt-4.2.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13f12bf58a32ebf15837fcd605cb3c99 qt-x11-opensource-src-4.2.3.tar.gz 37635710
-RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 qt-x11-opensource-src-4.2.3.tar.gz 37635710
-SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b qt-x11-opensource-src-4.2.3.tar.gz 37635710
diff --git a/x11-libs/qt/qt-4.2.3-r1.ebuild b/x11-libs/qt/qt-4.2.3-r1.ebuild
deleted file mode 100644
index cb71ab017c2e..000000000000
--- a/x11-libs/qt/qt-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3-r1.ebuild,v 1.13 2007/07/15 05:53:11 mr_bones_ 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}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="alpha amd64 hppa ia64 ppc 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 sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-DEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXfont
-	x11-libs/libSM
-	x11-proto/xextproto
-	x11-proto/inputproto
-	dev-util/pkgconfig
-	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-	virtual/xft
-	>=media-libs/freetype-2
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	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 )
-	input_devices_wacom? ( x11-drivers/linuxwacom )"
-
-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.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qt-4.1.4-sparc.patch
-	epatch ${FILESDIR}/qt4-sqlite-configure.patch
-	epatch ${FILESDIR}/utf8-bug-qt4-2.diff
-	epatch ${FILESDIR}/${P}-hppa-ldcw-fix.patch
-
-	cd ${S}/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
-
-	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
-	# separately as well.
-	cd ${S}/mkspecs/common
-
-	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}:" \
-		g++.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" linux.conf
-
-	cd ${S}
-
-}
-
-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)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	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 -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-	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 sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	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 qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-
-	use pch		&& myconf="${myconf} -pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	if ! use examples; then
-		myconf="${myconf} -nomake examples"
-	fi
-
-	./configure -stl -verbose -largefile -confirm-license \
-		-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 all || die
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	make INSTALL_ROOT=${D} install_subtargets || die
-	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
-
-	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
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
-
-	# Install .desktop files, from bug #174033
-	insinto /usr/share/applications
-	doins ${FILESDIR}/qt4/*.desktop
-
-	# 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"
-}