From: Caleb Tennis <caleb@gentoo.org>
Date: Thu, 22 Feb 2007 14:13:47 +0000 (+0000)
Subject: remove old version
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3673992e6cbd3b5b18b4be3705d1dd5569712b87;p=gentoo.git

remove old version
Package-Manager: portage-2.1.2-r8
---

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index cdea71a53849..5889caa32118 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.414 2007/02/22 14:10:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.415 2007/02/22 14:13:47 caleb Exp $
+
+  22 Feb 2007; Caleb Tennis <caleb@gentoo.org> -qt-4.2.1.ebuild:
+  remove old version
 
 *qt-3.3.8 (22 Feb 2007)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index bcb9e43704fc..59808f9026ab 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -120,7 +120,6 @@ DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66
 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.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
 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
 DIST qt-x11-opensource-src-4.2.2.tar.gz 37636491 RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 SHA1 8bee428d975f855ed02517763010002ca99715cc SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
 EBUILD qt-3.3.4-r8.ebuild 10491 RMD160 e6aa0743aa90a606385cbb263f5e3d0508229616 SHA1 03703f79f821ebf07cf4220d5368450099ebd36c SHA256 b71d5da031ccf8c06a93beb61b33e697363ecae268ab235cfeb3e811e75d03c6
 MD5 9cd4050cbf79528363ca2e0dbfbfd9fb qt-3.3.4-r8.ebuild 10491
@@ -142,18 +141,14 @@ EBUILD qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff S
 MD5 8f9beb1a3080a83dac2e8941aba8a06d qt-4.1.4-r2.ebuild 6855
 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff qt-4.1.4-r2.ebuild 6855
 SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff qt-4.1.4-r2.ebuild 6855
-EBUILD qt-4.2.1.ebuild 7917 RMD160 36a70bc03f912ef7134872a58b56f4829dd57497 SHA1 7257744ddd8bad6c2777e76c2775877e56c7f852 SHA256 716669c5f4d7f6d712228cec6b1a759d8a53a8c447cadcb84dfa8492517debcc
-MD5 053f6b83133fd3b5eff9ec988f334376 qt-4.2.1.ebuild 7917
-RMD160 36a70bc03f912ef7134872a58b56f4829dd57497 qt-4.2.1.ebuild 7917
-SHA256 716669c5f4d7f6d712228cec6b1a759d8a53a8c447cadcb84dfa8492517debcc qt-4.2.1.ebuild 7917
 EBUILD qt-4.2.2.ebuild 7691 RMD160 c22f499f93702a0000325da515c14f3d26c72175 SHA1 b16edc8e160fa949472f32b61e19a1cea84eab00 SHA256 9a283ff88292c02772d2b5cd508d4c510ccfe318f09ab15f1179f77416138ae2
 MD5 fe911ce7afaeeb22c93d7b6b02a633cb qt-4.2.2.ebuild 7691
 RMD160 c22f499f93702a0000325da515c14f3d26c72175 qt-4.2.2.ebuild 7691
 SHA256 9a283ff88292c02772d2b5cd508d4c510ccfe318f09ab15f1179f77416138ae2 qt-4.2.2.ebuild 7691
-MISC ChangeLog 24627 RMD160 3b8e8ee56467b9c0af41e562d15510e958db0c89 SHA1 a8cfd8dad4078623bbae74ef414a648411a30d3d SHA256 3c174f088027db1d940556ce53c4436f3c9319c0754ceed68dbfd0fea4f2738b
-MD5 039119a63fbb9da7169407e21a21464e ChangeLog 24627
-RMD160 3b8e8ee56467b9c0af41e562d15510e958db0c89 ChangeLog 24627
-SHA256 3c174f088027db1d940556ce53c4436f3c9319c0754ceed68dbfd0fea4f2738b ChangeLog 24627
+MISC ChangeLog 24714 RMD160 79be7a1bf78fa302ce6eeff0511fe29479ba8363 SHA1 5752954b8e2b131a8d63dc0a37114097359bc34f SHA256 ebd27bef4bd2bed220c4b5a8e3b3689d439c7d9ea53a95159fec10d54a8fe2f1
+MD5 9f3d3b66ca4310719dc1f1c95df5e64a ChangeLog 24714
+RMD160 79be7a1bf78fa302ce6eeff0511fe29479ba8363 ChangeLog 24714
+SHA256 ebd27bef4bd2bed220c4b5a8e3b3689d439c7d9ea53a95159fec10d54a8fe2f1 ChangeLog 24714
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -173,9 +168,6 @@ SHA256 b7e595acecd8a41b6d405b6a71225eaff8c5fbb00d3ee6ebff968c9ae2f5d55a files/di
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289
-MD5 5745eb95fbcdbb57fd56f19f6394b9aa files/digest-qt-4.2.1 289
-RMD160 fec797f1d0080976deb53495aa1a83e94ff245bc files/digest-qt-4.2.1 289
-SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/digest-qt-4.2.1 289
 MD5 521080f3e0b421ab5ad25f9dc25b69f1 files/digest-qt-4.2.2 289
 RMD160 6d2f65f407b6e455d477a31d49d969eeaf6db6da files/digest-qt-4.2.2 289
 SHA256 a5ce9efde5affef98446892de54ae4e5d8304554a9873eff9796c685e3c94d3e files/digest-qt-4.2.2 289
diff --git a/x11-libs/qt/files/digest-qt-4.2.1 b/x11-libs/qt/files/digest-qt-4.2.1
deleted file mode 100644
index c5644a01599f..000000000000
--- a/x11-libs/qt/files/digest-qt-4.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ab1c88084f55b94809f025a8503bf18 qt-x11-opensource-src-4.2.1.tar.gz 37069122
-RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 qt-x11-opensource-src-4.2.1.tar.gz 37069122
-SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4 qt-x11-opensource-src-4.2.1.tar.gz 37069122
diff --git a/x11-libs/qt/qt-4.2.1.ebuild b/x11-libs/qt/qt-4.2.1.ebuild
deleted file mode 100644
index d4f0e3783e65..000000000000
--- a/x11-libs/qt/qt-4.2.1.ebuild
+++ /dev/null
@@ -1,250 +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.1.ebuild,v 1.16 2006/12/19 19:11:20 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}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="accessibility cups debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres sqlite xinerama zlib ${IUSE_INPUT_DEVICES}"
-#IUSE removed dbus from iuse
-
-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
-	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 )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/libpq )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )
-	glib? ( dev-libs/glib )
-	input_devices_wacom? ( x11-drivers/linuxwacom )"
-#	dbus? ( >=sys-apps/dbus-0.93 )
-
-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)
-
-	# If the user current has qt4 bindings for dbus, we can't let them upgrade since they aren't
-	# yet supported for Qt4.2
-	if [ ! -z $(best_version =sys-apps/dbus-0.62*) ]; then
-		if built_with_use =sys-apps/dbus-0.62* qt4; then
-			eerror "You currently have dbus-0.62 installed with Qt4 bindings support."
-			eerror
-			eerror "Unfortunately, Qt-4.2 is not supported for these bindings. For now,"
-			eerror "if you want to continue using these bindings, you will need to "
-			eerror "package.mask =x11-libs/qt-4.2*"
-			eerror
-			eerror "If you do not need these bindings, re-emerge sys-apps/dbus-0.62 with the"
-			eerror "qt4 use flag turned off, and this message will go away."
-			eerror
-			eerror "Soon, we hope to provide built in dbus support for Qt-4.2"
-			eerror "See Gentoo bug #150888 for details"
-			die
-		fi
-	fi
-}
-
-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}/qt4-parisc-linux.diff
-	epatch ${FILESDIR}/qt-4.1.4-sparc.patch
-
-	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 -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 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"
-	myconf="${myconf} -no-qdbus"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-
-	use pch		&& myconf="${myconf} -pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -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
-
-	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}
-
-	# 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"
-}