Remove unused revision.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 18 insertions, 187 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index b7e9e7df193c..12ed47a4df7e 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.173 2012/06/08 12:49:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.174 2012/06/08 12:51:23 pesa Exp $
+
+  08 Jun 2012; Davide Pesavento <pesa@gentoo.org> -qt-core-4.8.1-r2.ebuild:
+  Remove unused revision.
 
   08 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt-core-4.8.1-r3.ebuild:
   Stable on hppa to force rebuild against icu-49, wrt bug 413541.
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index fc2b5bcbedcb..4de826c0bdd6 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -14,25 +14,24 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8c
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 RMD160 6a15077aee1e84076380787127b80c7bb97ebe86 SHA1 e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379
 EBUILD qt-core-4.6.3-r1.ebuild 5128 RMD160 c4415638e41f79147a94c36f6e089654c5040874 SHA1 1169313a308c4b01a0b8a74742550704d6b5bb2e SHA256 e403781b7f9188ffaa8a58c5e82d2fb1c802e50a8d9fd4efea8e26f141ef1f97
 EBUILD qt-core-4.7.4-r1.ebuild 5173 RMD160 a8f8118c4df899024978d80e0339f9153c999dc6 SHA1 c4978513baafbac348a492a6082aef879aa0a906 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be
-EBUILD qt-core-4.8.1-r2.ebuild 4754 RMD160 dd7b5dd9b2c632b093c70c0f26930e2ddda1cfc7 SHA1 312ef0e52db1f6a59f62d0264bf3618102d105fa SHA256 92a3e7fa7b8b0ac70854f92b7692d5396f593a75a9770bf962f44d2384ce7df9
 EBUILD qt-core-4.8.1-r3.ebuild 4668 RMD160 f429e278d3232084de68804a7615856714cad22c SHA1 f800a1298d2e0959303c43784d6bcbc3734dd6f9 SHA256 6d8487f28fa65cb3b9cef5415df2d919963f5892e3ac36bb49f708806f425e21
 EBUILD qt-core-4.8.2.ebuild 4728 RMD160 744ec067addd8fb8e9ee107836ca86d35f8160c0 SHA1 96b543f604f3cb72333023e3e3f6827a5b6fc7c9 SHA256 492ea75e4423596683ca95d6f985925bc5994985c1c6bd49e238c3e70560783b
-MISC ChangeLog 23509 RMD160 e9eff09472a8aa18ce75f4ee3ecf8d789c3ba52d SHA1 6759d9c0bda219320fdca34f1c92b2b3f2af8923 SHA256 44d824567ecbfc55ce844893059ee9f4a3e7509b133feb55bff03dcb1ad209db
+MISC ChangeLog 23612 RMD160 1fe56380cd3774f4ae69d419ecc8b4c5ac14b6c1 SHA1 268d71dc53639803a2452b4b7f692ce6f803e5c2 SHA256 06981b4a648837a2570b689d730c7aca2008f611b3d3c4db3b040da0dd247694
 MISC metadata.xml 873 RMD160 4c7d20b393a6d27bb28a29d86dffa8b93ad22988 SHA1 d6dc0c9e3b2ac646ff67900ba730cdba17517255 SHA256 514106c8027d9334f964d6166c326f768a8e4ecb2a122683a8953bfd47322af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP0fTVAAoJENXLsxwXqFxygCsQAL+DRfO/pm2+2xXWC6LOJaJW
-vKu4EDBfIUCkIrjzgmgYV0hQLEEOEnH1v+xIpl7BzeLjB00BNi6fhYC9WH/MMNVW
-FXT2yXYCIjY8hppI4EzN2t0dFzVeccd8e+sdWkQjDCypSSrOlfqbW0pCAVBTgBFu
-oKXMJSvp7xcxF/reP2TeFkvvZYFFWkp5iNgbhSMw5eJjBT6vUVf8D57A2P4ckOtk
-Ooj3oEzqdtenrTPZtBkSmsGo0ykotGdDC69c8UsTjURUvc9mdUyVSgSH49LF42Ux
-A36D6QPP9oxFNF9QD09O/VsBwLb95Bs/iSpT25c1WTXLmr9dQQTaa3AnN9OqzHsd
-TK4TVjkkp2cU11z5MTmDSFbhNpWcxLkLbEpoUal94tqDW9V9leQwootLSeaZkQm8
-I8XnAo8A5x5GgSzHyXKwCJhEbB0ejUVdwGMW7lPWc+qMQgyYcME7zdsDYV5mVtFF
-u5GIthPyJgPTZ779YTLym/CBoZqYvKin+C3UrxVVi2Hs4pi7OjTZVqV+F8u9jEAq
-7BUDoKXWdlrlMUILeon2B9Cz4UtaLkJOI5nSVSfauqRc3fvogJPL1x4crmVckIUl
-J6bq3CwcFzaE01YmR8edssM3EIDkte4OUZ7BLWB8alONUPpAAKx2n2kp9OAX34bT
-k8r5AU62DddOYH2UA1+j
-=0Y1a
+iQIcBAEBCgAGBQJP0fVQAAoJENXLsxwXqFxyJ/0P/0cFOOQjlvUydPlnQKD2bwZP
+WgCMoZCHT3znTbvfI8LqBW/jzHhKn8M3DBwTkvkJDuRbyjyTFi4rWoIw6z8iQI8F
+p1ktGpVQT/KlIaE3PNZB+WqBimPByxRyv8YypB8lqjtzXtmX8plfi7x+XokagCBC
+iGxm9+8k8WoWPrfuTGkmfhJzuqQ8LVbHDKWHAn2oKysQ7M0zbk7H5ZNHGaqZNAvz
+K/8STE4IzTgXTc8QZXp6kTbjtxMKkvxTMDXUw/aVOH7H0HoLfmGWiG/I8ohzp0H9
++EA7rjCZeQidwd8YUSrwkRCTIeY8PeGWFIV8jBQyGeg8WJty4FTQsf5EQMeHU8B1
+lX2aVVoFBAer/b1TMsjrGUlKa5atARCo3C0Poc56iUiI0POy58QqYMSFHodRDWtw
+1n0yxHmklQZ+dL7LjvOJt46Vy+4tRUnjubTejsSCo2OKofK6+z7UtRmLSQRQHub8
+8N1mfHlx6ttZ1q6powuL67wVPB6Y/BvtE0TKiaf7lubqBIoc703zxeKWuesSo0Zf
+qWTwc9DPM0MJff6b7qLdr5L9yOf6oto/+iaztlzuzWWrbAXEezCywIpYVWPQQgoH
+E77TiXS9a9FEL3nnXz8EbrCvJU4lePdmUQKrz85uWabR/bBZZYdRavacFPm/WJgB
+3e1ZgfJupXoVOAkZmCzG
+=CxFQ
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/qt-core-4.8.1-r2.ebuild b/x11-libs/qt-core/qt-core-4.8.1-r2.ebuild
deleted file mode 100644
index b805562d7aa6..000000000000
--- a/x11-libs/qt-core/qt-core-4.8.1-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.1-r2.ebuild,v 1.7 2012/05/20 13:04:44 ago Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-KEYWORDS="amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+glib iconv optimized-qmake qt3support ssl"
-
-DEPEND="
-	sys-libs/zlib
-	glib? ( dev-libs/glib )
-	ssl? ( dev-libs/openssl )
-	!<x11-libs/cairo-1.10.2-r2
-	!<x11-libs/qt-4.4.0:4
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
-"
-
-PATCHES=(
-	"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
-	"${FILESDIR}/${P}-localized-time.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/tools/bootstrap
-		src/tools/moc
-		src/tools/rcc
-		src/tools/uic
-		src/corelib
-		src/xml
-		src/network
-		src/plugins/codecs
-		tools/linguist/lconvert
-		tools/linguist/lrelease
-		tools/linguist/lupdate"
-
-	# This is not needed in live ebuilds since the git repo contains everything
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES=" ${QT4_TARGET_DIRECTORIES}
-			include/Qt
-			include/QtCore
-			include/QtDeclarative
-			include/QtGui
-			include/QtNetwork
-			include/QtScript
-			include/QtXml
-			src/plugins/plugins.pro
-			src/plugins/qpluginbase.pri
-			src/src.pro
-			src/3rdparty/des
-			src/3rdparty/harfbuzz
-			src/3rdparty/md4
-			src/3rdparty/md5
-			src/3rdparty/sha1
-			src/3rdparty/easing
-			src/3rdparty/zlib_dependency.pri
-			src/declarative
-			src/gui
-			src/script
-			tools/shared
-			tools/linguist/shared
-			translations"
-	fi
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	# Don't pre-strip, bug 235026
-	for i in kr jp cn tw; do
-		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
-	done
-
-	qt4-build_src_prepare
-
-	# bug 172219
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
-	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-}
-
-src_configure() {
-	myconf+="
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-		$(qt_use glib)
-		$(qt_use iconv)
-		$(qt_use optimized-qmake)
-		$(qt_use ssl openssl)
-		$(qt_use qt3support)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
-	install_directories src/{corelib,xml,network,plugins/codecs}
-
-	emake INSTALL_ROOT="${D}" install_mkspecs
-
-	# install private headers
-	insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
-	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
-
-	# use freshly built libraries
-	local DYLD_FPATH=
-	[[ -d "${S}"/lib/QtCore.framework ]] \
-		&& DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
-	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
-		LD_LIBRARY_PATH="${S}/lib" \
-		"${S}"/bin/lrelease translations/*.ts \
-		|| die "generating translations failed"
-	insinto "${QTTRANSDIR#${EPREFIX}}"
-	doins translations/*.qm
-
-	setqtenv
-	fix_library_files
-
-	# List all the multilib libdirs
-	local libdirs=
-	for libdir in $(get_all_libdirs); do
-		libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
-	done
-
-	cat <<-EOF > "${T}"/44qt4
-	LDPATH="${libdirs:1}"
-	EOF
-	doenvd "${T}"/44qt4
-
-	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
-	mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
-		|| die "failed to move qconfig.pri"
-
-	# Framework hacking
-	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-		# TODO: do this better
-		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
-			|| die "sed for qconfig.h failed."
-		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
-	else
-		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
-			|| die "sed for qconfig.h failed"
-	fi
-
-	QCONFIG_DEFINE="QT_ZLIB"
-	install_qconfigs
-
-	# remove .la files
-	find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
-
-	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
-	# Framework magic
-	fix_includes
-}