old

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

4 files changed, 29 insertions, 180 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 0ee00f4f97af..e7d9e3698ba8 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # 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.188 2012/09/16 04:10:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.189 2012/09/18 02:51:56 pesa Exp $
+
+  18 Sep 2012; Davide Pesavento <pesa@gentoo.org> -qt-core-4.8.3.ebuild,
+  qt-core-4.8.3-r1.ebuild:
+  old
 
 *qt-core-4.8.3-r1 (16 Sep 2012)
 
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 5a626bc4d708..376913cea1b6 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX blacklist-diginotar-certs.diff 6153 SHA256 461a6c1b0618119251ab03ee668aaa93f6a8b8ba1298d8eb928f87df70c76d75 SHA512 ec8bcef856a1aeeccf3b3edaf08cb441ef46edadc8704c8898e115647abc83608f1b89cde72a0164e92638ff95b65b6e5a9c68c07f0b8b9ddc12db57d008315f WHIRLPOOL 011787e35e85239e69c5947ea9574fc8c66d52bd16bb5f5981fecb76496cc6b6c106f8ff09339170717cca6942a2088ae00292b56247aa2778063b541cc3540d
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
@@ -10,7 +13,23 @@ DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861b
 EBUILD qt-core-4.7.4-r1.ebuild 5173 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be SHA512 3327854c067605cb9f5bbdcf73844ff80bafca854b36a94e1f1903242d7b61b3f339b38f86cac01f5944d0225dc146f9edf58eba86c03cfb4c10223ee2da981a WHIRLPOOL 635f612d97faf210028d9edac8369b4b7decf7432e9ef83753b1e4e4506f08930fe15863a31c21cb1fe4b6525d0ed7d78a961518b517eb1aebe7328054513497
 EBUILD qt-core-4.8.1-r3.ebuild 4681 SHA256 aab21e25ea90adca35a99f4d7d09473d982ae6f20490d427d0dacc666325137b SHA512 9e2404c6856f1b4c61dec834444424846e42f574d1af1f84fabc2c83f915320f27bc337169508a342972d4fdb9d67abda7bac7c13590920de9d585c691a93b90 WHIRLPOOL 82b5b0677f32c753b61699370fc018edccc18a366b2357483eefbec044b0b1bed1f756591f4c14026cba01b68c38c2383d21d58a6d3f27701159152b279dd27b
 EBUILD qt-core-4.8.2.ebuild 4777 SHA256 bf979a0db6b1c0dc318e8dfd373a2341308a8403b4c00a8ea4080ef31c996aba SHA512 76f000d6682612375a5003afd89c18e3a0424409f21a158f3cd910026e5f16906f5186863bc752359526e3e563d62c29eb56603976ad75861f9691a3855de56c WHIRLPOOL 3ea0f26b71306e53c78c6897e53f15ce1388f065783d0e3449676bae966dc9d12cca2ae5525b3a4561a81359a628d2f91d835134ecb205b4a631c3942dc7ca20
-EBUILD qt-core-4.8.3-r1.ebuild 5118 SHA256 3f0b00fcc3a27da7e73c1cb179504eb9f0691e687a8a35bbe83290080e5e979f SHA512 d02c02a3e0cb9fea9040a80c514607b5e2838dd6cbb13ec67916c1d77e0a8ba6f1817eedbc11010d9c20b6f532781746c08193a7d7a06827de0005376f2be566 WHIRLPOOL b436b36c8d503b635642da712e9e5a06e5e49ab9c5bea8c346725fa9cd74c118f39d297003fb48c3c1c243aaeb54c959860841ede9bc7923aa59b1a2c95e3438
-EBUILD qt-core-4.8.3.ebuild 4739 SHA256 4d7db5973f32ca246ef99c21ed35ba283ef43da20c3b445cde6fb4b9ff303750 SHA512 a65899e8d0ba746a35e0c542a9a84fa78ea9c3d9c0765a7977dd52b4632107712e06690ecb0cfc3d328c9cc8317b24b6221d6571e8647eeab203a783e9548fc7 WHIRLPOOL 6b23faa12667e2f759e884107338a7dd5924d109388107caded36c98408ec0a9ca88beabf83ff9e6755caf055fb8178f683e654bcdaed0e852685d00bae37c2a
-MISC ChangeLog 25350 SHA256 2821905307cc6752181a644a5f3d4ce7ad228fc17b5fe134080c28614b26dbfb SHA512 c192226eda5c18b41396080af45828574db0fba59baf1970ce561b2fb85d8f3796e19a5c449caa23897632ad2d4887ff789583d58da5831c1cc503735a39f4c9 WHIRLPOOL 401d281d77c441520d601c5d18bc006e4042703942b884f927c3fc68a61f235ab85d4baafb9ae73002b03d1653a8e70168422a9a20d419e15f621730cf2e3bda
+EBUILD qt-core-4.8.3-r1.ebuild 5115 SHA256 3e3406b94225ae501e5c6b4e3c9f5649000ff7253711dd50fce40834a642eb79 SHA512 b664bd28b62b6c2e75d3e0f5e1449824cd689a399af0c4122b4883378b1f02a876a2453b4b2bdd57d6041ee00c52b27d8f8b60e740b98d65c41deb784f50d575 WHIRLPOOL 7dee70d30a1d969694ffe62ee22a83fe3da703a119b5284d0425b1ed248d4f46af7b14fb1cfea60fb420d6850d1c4bbbf0d80197312d207ff04a29da57f47fe8
+MISC ChangeLog 25455 SHA256 f554454803b07bc0447272aa1cf72bb3019400a4aee732f1bb124bd969166d36 SHA512 e3f3e5be4eaa7d79352104f5a67f47ddb090ddddd92aa1a6eff7eb0e4651044330715af2ef8b0dcf536bd56e599b81d8e95f71b324914d6604b5a0feebc007fa WHIRLPOOL 7f828cc6ab1284ece0b1bae1f8e7342f5f1b14529dbee9ef0a139ac891956a208c68372108010641ad2667bd06046236d6b72b023bd42e14b1e9efc286e2f401
 MISC metadata.xml 962 SHA256 5e48f820fb8a186626c8816f7f143667495a43bdc5e2765f628c2134c0034638 SHA512 c1598a11c993175dcc9fbb6c3af19bafca74a39122c1d769b6f0cfb73a168e729d14edc46adcb2ccb638c3eecb10dad5a58f9070c178b86447a6ccdd2eba5fa0 WHIRLPOOL f10d5b7a5f20535d3d7e410d9a923afb34e2fc8151c45aab8035a326127a3cd511f2ff843f0094495a53c200b2242635e8d8f52e9dd08d7850014957b872e812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQV+HiAAoJENXLsxwXqFxyelYQAIf1wCOipXVEz3EKZUVSQw+h
+15lPKOZ3+nlulmNdPwQJDjjtQwRzDtLvwCPkEqbsb21IrXfqtUvzYEjpMpNodfp/
+56no3lAOSzr0ucmCO7Uz9suEN8cG95eRllGuOrt5ivpQrgBxnNCCuJGKzpOYOzwu
+dYwcFBccHllL8Vuz/EUXBrg0pc3AcezL1oyvNDklZ5CAFTbfW9Ro1doQhnRhGn6c
+d/69beSTtroLDxRkj43ZNyheRVYUcFAecQ5ReKzlwXR8UY/pkiMrRGEGORAR3J+G
+n7Hfbr8Q3/W8O8c+xNDRm8o7Ry1VJZPrCSBDdxtlFGwcm+IZsxXaWgIobb/iJ/RV
+NWNIDdRgv7FrYh+skYvJh3Cx9HYRrbe/1bx9411+eDBIbZbxpOMWAN0JjSQE9lt3
+aWeS7ESYX5qABAhN+L8GAKmC60kZZ+2LfZXXLvB7otq9F/QUNKvBTf9ve3QrLhKB
+74OFy/mH9GXLva1JAzjhIO+YH5h6eihwXm83vv6YLjKiiSjDK9mbWmjjekSbN2wK
+ylLcCQhdFlcsaBR1e+b37gMpi4rdA2Z0NafQ4zI941xbrSSKjoTSyNcBtT5bp0JW
+6ssQSD3wAAgjAK/SrmTA9FsNcu1zPpOkuR7nXrl/vbB+fXtEJwVrKhEyhhYvO9tW
+NPdYd9Wdlows0isYbMps
+=Hh4o
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/qt-core-4.8.3-r1.ebuild b/x11-libs/qt-core/qt-core-4.8.3-r1.ebuild
index 9a857db4d755..9d9b0f058de1 100644
--- a/x11-libs/qt-core/qt-core-4.8.3-r1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.1 2012/09/16 04:10:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.3-r1.ebuild,v 1.2 2012/09/18 02:51:56 pesa Exp $
 
 EAPI=4
 
@@ -88,7 +88,7 @@ src_prepare() {
 	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
 
-	# bug #427782
+	# bug 427782
 	sed -i -e "/^CPPFLAGS/s/-g//" \
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
 	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
diff --git a/x11-libs/qt-core/qt-core-4.8.3.ebuild b/x11-libs/qt-core/qt-core-4.8.3.ebuild
deleted file mode 100644
index abc761948846..000000000000
--- a/x11-libs/qt-core/qt-core-4.8.3.ebuild
+++ /dev/null
@@ -1,174 +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.3.ebuild,v 1.1 2012/09/14 07:33:26 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="+glib iconv icu optimized-qmake qt3support ssl"
-
-DEPEND="
-	sys-libs/zlib
-	glib? ( dev-libs/glib:2 )
-	icu? ( >=dev-libs/icu-49 )
-	ssl? ( dev-libs/openssl )
-	!<x11-libs/cairo-1.10.2-r2
-	!x11-libs/qt:4
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qt3support] )
-"
-
-PATCHES=(
-	"${FILESDIR}/moc-workaround-for-boost-1.48.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"
-
-	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"
-
-	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-openvg
-		-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 icu)
-		$(qt_use optimized-qmake)
-		$(use ssl && echo -openssl-linked || echo -no-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
-}