Removing masked file

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 5 insertions, 409 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index a73fd802c67c..a2aefc2a3d46 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.571 2009/04/27 19:52:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.572 2009/04/27 19:57:26 hwoarang Exp $
+
+  27 Apr 2009; Markos Chandras <hwoarang@gentoo.org> -qt-3.3.8-r4.ebuild:
+  Remove masked ebuild
 
 *qt-4.5.1 (27 Apr 2009)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 4850419c615a..561f45b56aca 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -30,13 +30,11 @@ AUX qt4/Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SH
 AUX qt4/Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
 AUX qt4/Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
 AUX utf8-bug-qt3.diff 2670 RMD160 f5db1461cd82ac98417ab641228e15816d160724 SHA1 ca5ecb29c7f1c826d48703339a3371038e306bb7 SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0
-DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
 DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
-EBUILD qt-3.3.8-r4.ebuild 11991 RMD160 c96316409482b86a2b5a0324c76a21d4b6a0b857 SHA1 327a62ad18ce32990fce883938d55c1ed105f932 SHA256 c4a2123a60126bb091828d53aa618162ecd929b0dd1d5533d1aa4151a7123316
 EBUILD qt-3.3.8b-r1.ebuild 10827 RMD160 ae7bb6928438b1412c1398ffdd7a9f634e8be613 SHA1 e2f74ce93b42735f2eddf64db38299d7a8e6a811 SHA256 c5e342439f6d7da84fbaf9ea06cbedd5a07fb6fec3a42e8fae6fd0f995ab3da6
 EBUILD qt-4.4.2.ebuild 868 RMD160 6cc9b0ab5112df2148f0e001cc9a6161d78e71f3 SHA1 88c8cabbdb62a3650a0e2cb7494aba9245523090 SHA256 90fb353b51bcd036e0dc2df6b68538ca1656abf10c045ca2ac1c707f23f0d288
 EBUILD qt-4.5.0.ebuild 1326 RMD160 3e0280cc44556df8237b405f79d78ab59aad1bde SHA1 d75e79a1d230cf704290f8881ff09e36f3fee3fb SHA256 7a66ece03e1852b470c709bd993bdb3972d9f2c8dfe75cb05ef16e01c2c14ef5
 EBUILD qt-4.5.1.ebuild 1327 RMD160 c9aae48058336ad7b0a1622ad5546910f0d9c655 SHA1 0f0e71575e8c3188051214557c49d3f931c0f9eb SHA256 117a7ae8af57467d70d02d163d8d6cb9f0b8eb9179cc94f85f1c10e98fe61f6b
-MISC ChangeLog 45435 RMD160 8fd07f3caf51f40bd531391ab40e63fec46db93f SHA1 e7feabd2de694f1f03752e3ed2b9fba1dbea1f40 SHA256 118a4bbf5bde821d2dc214413cd2ac376af33fd5580c40c22347877e56a43817
+MISC ChangeLog 45533 RMD160 526ec8acee4ea498c62ac6beb879b86b121f8465 SHA1 a929c8fdc20792fc1ba21ee598354fdd77ebd308 SHA256 cd268c09c2982fddcfae22e1aefe1aa20e95d5aaef63cc3d32ad317f30fae219
 MISC metadata.xml 407 RMD160 bfda8fdbc5ea472d99e31e9c5c83e67a5e0b9ae1 SHA1 9bf8db20b71bd9e189872922eae678fff40eeb8d SHA256 8598cd7af79529ba00ebb8a0d2b32b6e8a03cb5b90ae700f16dd3bcce71dac79
diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild
deleted file mode 100644
index 340a60b534fc..000000000000
--- a/x11-libs/qt/qt-3.3.8-r4.ebuild
+++ /dev/null
@@ -1,405 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.10 2009/01/09 14:09:54 remi Exp $
-
-# *** Please remember to update qt3.eclass when revbumping this ***
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
-	immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
-	immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
-
-RDEPEND="
-	media-libs/jpeg
-	>=media-libs/freetype-2
-	>=media-libs/libmng-1.0.9
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/libXft
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libSM
-	cups? ( net-print/cups )
-	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	nas? ( >=media-libs/nas-1.5 )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( virtual/postgresql-base )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	immqt? ( x11-proto/xineramaproto )
-	immqt-bc? ( x11-proto/xineramaproto )"
-PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
-
-QTBASE=/usr/qt/3
-
-pkg_setup() {
-	if use immqt && use immqt-bc ; then
-		ewarn
-		ewarn "immqt and immqt-bc are exclusive. You cannot set both."
-		ewarn "Please specify either immqt or immqt-bc."
-		ewarn
-		die
-	elif use immqt ; then
-		ewarn
-		ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
-		ewarn "you have to recompile everything depending on Qt after you install it."
-		ewarn "Be aware."
-		ewarn
-	fi
-
-	export QTDIR="${S}"
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		PLATCXX="g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		PLATCXX="icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			PLATNAME="freebsd" ;;
-		*-openbsd*)
-			PLATNAME="openbsd" ;;
-		*-netbsd*)
-			PLATNAME="netbsd" ;;
-		*-darwin*)
-			PLATNAME="darwin" ;;
-		*-linux-*|*-linux)
-			PLATNAME="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	# probably this should be '*-64' for 64bit archs
-	# in a fully multilib environment (no compatibility symlinks)
-	export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-	# Do not link with -rpath. See bug #75181.
-	find "${S}"/mkspecs -name qmake.conf | xargs \
-		sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-
-	# Patch for uic includehint errors (aseigo patch)
-	epatch "${FILESDIR}"/${P}-uic-fix.patch
-
-	# Patch for mysql unload crash (Bug #171883)
-	epatch "${FILESDIR}"/${P}-mysql-unload-crash.diff
-
-	# KDE related patches
-	epatch "${FILESDIR}"/0001-dnd_optimization.patch
-	epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch
-	epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch
-	epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff
-	epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff
-	epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch
-
-	# possible rce, CVE-2007-3388
-	epatch "${FILESDIR}"/0081-format-string-fixes.diff
-
-	# Bug #192472
-	epatch "${FILESDIR}"/${P}-unicode-off-by-one.patch
-
-	# ulibc patch (bug #100246)
-	epatch "${FILESDIR}"/qt-ulibc.patch
-
-	# xinerama patch: http://ktown.kde.org/~seli/xinerama/
-	epatch "${FILESDIR}"/${P}-seli-xinerama.patch
-
-	epatch "${FILESDIR}"/utf8-bug-qt3.diff
-
-	# Visibility patch, apply only on GCC 4.1 and later for safety
-	# [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
-	epatch "${FILESDIR}"/${P}-visibility.patch
-
-	# Fix configure to correctly pick up gcc version, bug 244732
-	epatch "${FILESDIR}"/${P}-fix-compiler-detection.patch
-
-	if use immqt || use immqt-bc ; then
-		epatch ../${IMMQT_P}.diff
-		sh make-symlinks.sh || die "make symlinks failed"
-
-		epatch "${FILESDIR}/${P}-immqt+gcc-4.3.patch"
-	fi
-
-	if use mips; then
-		epatch "${FILESDIR}"/${P}-mips.patch
-	fi
-
-	# known working flags wrt #77623
-	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
-	# set c/xxflags and ldflags
-	strip-flags
-	append-flags -fno-strict-aliasing
-
-	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
-	fi
-
-	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}:" \
-		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
-		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
-		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
-		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
-		"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
-
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e "s:/lib$:/$(get_libdir):" \
-			"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
-	fi
-}
-
-src_compile() {
-	export SYSCONF="${D}${QTBASE}/etc/settings"
-
-	# Let's just allow writing to these directories during Qt emerge
-	# as it makes Qt much happier.
-	addwrite "${QTBASE}/etc/settings"
-	addwrite "${HOME}/.qt"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use nis		&& myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
-	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
-	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/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
-	use firebird    && myconf="${myconf} -plugin-sql-ibase -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use cups	&& myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
-	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
-	use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
-
-	myconf="${myconf} -system-zlib"
-
-	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
-	use immqt-bc	&& myconf="${myconf} -inputmethod"
-	use immqt	&& myconf="${myconf} -inputmethod -inputmethod-ext"
-
-	if use ppc-macos ; then
-		myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
-		myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
-		myconf="${myconf} -L${S}/lib -I${S}/include"
-		sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
-	fi
-
-	export YACC='byacc -d'
-	tc-export CC CXX
-	export LINK="$(tc-getCXX)"
-
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
-		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
-	emake src-qmake src-moc sub-src || die
-
-	export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	emake sub-tools || die
-
-	if use examples; then
-		emake sub-tutorial sub-examples || die
-	fi
-
-	# Make the msg2qm utility (not made by default)
-	cd "${S}"/tools/msg2qm
-	../../bin/qmake
-	emake
-
-	# Make the qembed utility (not made by default)
-	cd "${S}"/tools/qembed
-	../../bin/qmake
-	emake
-
-}
-
-src_install() {
-	# binaries
-	into "${QTBASE}"
-	dobin bin/*
-	dobin tools/msg2qm/msg2qm
-	dobin tools/qembed/qembed
-
-	# libraries
-	if use ppc-macos; then
-		# dolib is broken on BSD because of missing readlink(1)
-		dodir "${QTBASE}"/$(get_libdir)
-		cp -fR lib/*.{dylib,la,a} "${D}/${QTBASE}"/$(get_libdir) || die
-
-		cd "${D}/${QTBASE}"/$(get_libdir)
-		for lib in libqt-mt* ; do
-			ln -s ${lib} ${lib/-mt/}
-		done
-	else
-		dolib.so lib/lib{editor,qassistantclient,designercore}.a
-		dolib.so lib/libqt-mt.la
-		dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
-		cd "${D}/${QTBASE}"/$(get_libdir)
-
-		for x in libqui.so ; do
-			ln -s $x.1.0.0 $x.1.0
-			ln -s $x.1.0 $x.1
-			ln -s $x.1 $x
-		done
-
-		# version symlinks - 3.3.5->3.3->3->.so
-		ln -s libqt-mt.so.${PV} libqt-mt.so.3.3
-		ln -s libqt-mt.so.3.3 libqt-mt.so.3
-		ln -s libqt-mt.so.3 libqt-mt.so
-
-		# libqt -> libqt-mt symlinks
-		ln -s libqt-mt.so.${PV} libqt.so.${PV}
-		ln -s libqt-mt.so.3.3 libqt.so.3.3
-		ln -s libqt-mt.so.3 libqt.so.3
-		ln -s libqt-mt.so libqt.so
-	fi
-
-	# plugins
-	cd "${S}"
-	local plugins=$(find plugins -name "lib*.so" -print)
-	for x in ${plugins}; do
-		exeinto "${QTBASE}"/$(dirname ${x})
-		doexe ${x}
-	done
-
-	# Past this point just needs to be done once
-	is_final_abi || return 0
-
-	# includes
-	cd "${S}"
-	dodir "${QTBASE}"/include/private
-	cp include/* "${D}/${QTBASE}"/include/
-	cp include/private/* "${D}/${QTBASE}"/include/private/
-
-	# prl files
-	sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
-	insinto "${QTBASE}"/$(get_libdir)
-	doins "${S}"/lib/*.prl
-
-	# pkg-config file
-	insinto "${QTBASE}"/$(get_libdir)/pkgconfig
-	doins "${S}"/lib/*.pc
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${QTBASE}/${libdir}"
-	done
-
-	# environment variables
-	if use ppc-macos; then
-		cat <<EOF > "${T}"/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-DYLD_LIBRARY_PATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
-EOF
-	else
-		cat <<EOF > "${T}"/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
-EOF
-	fi
-	cat <<EOF > "${T}"/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
-	cat <<EOF > "${T}"/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
-	insinto /etc/revdep-rebuild
-	doins "${T}"/50-qt3-revdep
-
-	doenvd "${T}"/45qt3 "${T}"/50qtdir3
-
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) "${QTBASE}"/lib
-	fi
-
-	insinto "${QTBASE}"/tools/designer
-	doins -r tools/designer/templates
-
-	insinto "${QTBASE}"
-	doins -r translations
-
-	keepdir "${QTBASE}"/etc/settings
-
-	if use doc; then
-		insinto "${QTBASE}"
-		doins -r "${S}"/doc
-	fi
-
-	if use examples; then
-		find "${S}"/examples "${S}"/tutorial -name Makefile | \
-			xargs sed -i -e "s:${S}:${QTBASE}:g"
-
-		cp -r "${S}"/examples "${D}${QTBASE}"/
-		cp -r "${S}"/tutorial "${D}${QTBASE}"/
-	fi
-
-	# misc build reqs
-	insinto "${QTBASE}"/mkspecs
-	doins -r "${S}/mkspecs/${PLATFORM}"
-
-	sed -e "s:${S}:${QTBASE}:g" \
-		"${S}"/.qmake.cache > "${D}${QTBASE}"/.qmake.cache
-
-	dodoc FAQ README README-QT.TXT changes*
-	if use immqt || use immqt-bc ; then
-		dodoc "${S}"/README.immodule
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
-	elog "or widgets for the Qt designer) are no longer recognized.  If this situation"
-	elog "occurs you should recompile the packages providing these plugins,"
-	elog "and you should also make sure that Qt and its plugins were compiled with the"
-	elog "same version of gcc.  Packages that may need to be rebuilt are, for instance,"
-	elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
-	elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
-	echo
-}