Remove 3.3.3, and remove giflib/libungif dependency in 3.3.3-r1

Package-Manager: portage-2.0.51.22-r1

5 files changed, 8 insertions, 251 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 4384f66fb550..33d64779a0b2 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.222 2005/06/01 15:46:24 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.223 2005/06/03 18:31:48 caleb Exp $
+
+  03 Jun 2005; Caleb Tennis <caleb@gentoo.org> -qt-3.3.3.ebuild,
+  qt-3.3.3-r1.ebuild:
+  Remove 3.3.3, and remove giflib/libungif dependency in 3.3.3-r1
 
   01 Jun 2005; Herbie Hopkins <herbs@gentoo.org> qt-3.3.4-r4.ebuild:
   Use correct libdir in qmake.conf.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 65a12c47e4ac..2fee834a8fdf 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,23 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4f8e5fad7ce7529afc9f924f618ae0f0 qt-3.3.4-r3.ebuild 8950
-MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+MD5 88875c77c2482de25169850cfc19faf5 qt-3.3.3-r1.ebuild 7987
 MD5 f95213fd78b54c46551f61351142beb7 qt-4.0.0_beta2.ebuild 5982
 MD5 417ad387ed16d015fdc15dd25deca382 qt-4.0.0_beta2-r2.ebuild 6098
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
 MD5 dc7eab137481c73dca4e2ea75795fa9f qt-4.0.0_beta1-r5.ebuild 5880
 MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
-MD5 ef971d96f77aba0a084fe906885daf50 ChangeLog 37013
+MD5 011ab8750062c31f26db14299098cea8 ChangeLog 37167
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 08029b610ff355dafc7618ea1abaec61 qt-4.0.0_beta2-r1.ebuild 5985
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 9207a8f92e32bd42c37464f13abc7b3c files/digest-qt-4.0.0_beta1-r5 99
 MD5 480ed8db4d3b3421ef01741ab58f6673 files/digest-qt-4.0.0_beta2-r1 100
@@ -47,10 +42,3 @@ MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 12
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
 MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCndka2G5bA0cA/ScRAjfbAJ0QA+R78nuLDmkVV2fvn9nGfOUpXQCgpBb8
-R6YLjfi5sQeOO6K+k6AUX70=
-=/b6r
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-3.3.3 b/x11-libs/qt/files/digest-qt-3.3.3
deleted file mode 100644
index 694b52ee5a4a..000000000000
--- a/x11-libs/qt/files/digest-qt-3.3.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812
-MD5 93ad7baa2b4c35832baf47c101444355 qt-x11-immodule-unified-qt3.3.3-20040819.diff.gz 131600
diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild
index 7e79afc3254d..72fde29347ae 100644
--- a/x11-libs/qt/qt-3.3.3-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.9 2005/01/08 10:36:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.10 2005/06/03 18:31:48 caleb Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,7 +23,6 @@ IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite
 DEPEND="virtual/x11 virtual/xft
 	media-libs/libpng media-libs/jpeg media-libs/libmng
 	>=media-libs/freetype-2
-	gif? ( media-libs/giflib media-libs/libungif )
 	nas? ( >=media-libs/nas-1.5 )
 	odbc? ( dev-db/unixODBC )
 	mysql? ( dev-db/mysql )
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
deleted file mode 100644
index 5f7c59f70415..000000000000
--- a/x11-libs/qt/qt-3.3.3.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.19 2005/01/08 10:36:27 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040819"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
-	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="x86 alpha ppc amd64 sparc hppa mips ppc64 ia64"
-IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
-
-DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng media-libs/jpeg media-libs/libmng
-	>=media-libs/freetype-2
-	gif? ( media-libs/giflib media-libs/libungif )
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( dev-db/mysql )
-	sqlite? ( =dev-db/sqlite-2* )
-	firebird? ( dev-db/firebird )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/postgresql )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )
-	icc? ( dev-lang/icc )"
-
-# old immodules may cause segfaults on some qt applications,
-# especially qtconfig
-PDEPEND="!<app-i18n/scim-qtimm-0.7
-	!<app-i18n/uim-qt-0.1.7
-	!>=app-i18n/uim-qt-0.1.9"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-QTBASE=/usr/qt/3
-export QTDIR=${S}
-export PLATFORM=linux-g++
-
-pkg_setup() {
-	if 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
-}
-
-src_unpack() {
-	unpack ${A}
-
-	export QTDIR=${S}
-	cd ${S}
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	epatch ${FILESDIR}/qt-no-rpath-uic.patch
-
-	if use immqt || use immqt-bc ; then
-		epatch ../${IMMQT_P}.diff
-		epatch ${FILESDIR}/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff
-
-		epatch ${FILESDIR}/qt-3.3.3-immodule-r123-event-inversion-20040909.diff
-		sh make-symlinks.sh || die "make symlinks failed"
-	fi
-
-	cd mkspecs/linux-g++
-	# set c/xxflags and ldflags
-	strip-flags
-	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
-	cd ${S}
-
-#	use icc && export PLATFORM=linux-icc
-}
-
-src_compile() {
-	export QTDIR=${S}
-	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"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use gif		&& myconf="${myconf} -qt-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" || 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 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"
-	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
-	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
-	use immqt-bc	&& myconf="${myconf} -im"
-	use immqt	&& myconf="${myconf} -im -im-ext"
-
-	export YACC='byacc -d'
-
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl || die
-
-	export QTDIR=${S}
-
-	emake src-qmake src-moc sub-src || die
-	LD_LIBRARY_PATH="${S}/$(get_libdir):${LD_LIBRARY_PATH}" emake sub-tools || die
-}
-
-src_install() {
-	# needed to fix lib64 issues on amd64, see bug #45669
-	# It would be better to have lib -> lib64, but other libs might be
-	# installed in ${QTBASE}/lib which is not currently a symlink...
-	if use amd64; then
-		dodir ${QTBASE}/lib
-		dosym lib ${QTBASE}/lib64
-	fi
-
-	export QTDIR=${S}
-
-	# binaries
-	into $QTBASE
-	dobin bin/*
-
-	# libraries
-
-	dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0
-	dolib lib/lib{editor,qassistantclient,designercore}.a lib/libqt-mt.la
-
-	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.3->3.3->3->.so
-	ln -s libqt-mt.so.3.3.3 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.3.3.3 libqt.so.3.3.3
-	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
-
-	# includes
-	cd ${S}
-	dodir ${QTBASE}/include/private
-	cp include/* ${D}/${QTBASE}/include/
-	cp include/private/* ${D}/${QTBASE}/include/private/
-
-	# misc
-	insinto /etc/env.d
-	doins ${FILESDIR}/{45qt3,50qtdir3}
-
-	dodir ${QTBASE}/tools/designer/templates
-	cd ${S}
-	cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates
-
-	dodir ${QTBASE}/translations
-	cd ${S}
-	cp translations/* ${D}/${QTBASE}/translations
-
-	dodir ${QTBASE}/etc
-	keepdir ${QTBASE}/etc/settings
-
-	dodir ${QTBASE}/doc
-
-	if use doc; then
-		cp -r ${S}/doc ${D}/${QTBASE}
-
-		cd ${S}/examples
-		find . -name Makefile | while read MAKEFILE
-		do
-			cp ${MAKEFILE} ${MAKEFILE}.old
-			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
-			rm -f ${MAKEFILE}.old
-		done
-
-		cp -r ${S}/examples ${D}/${QTBASE}
-
-		cd ${S}/tutorial
-		find . -name Makefile | while read MAKEFILE
-		do
-			cp ${MAKEFILE} ${MAKEFILE}.old
-			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
-			rm -f ${MAKEFILE}.old
-		done
-
-		cp -r ${S}/tutorial ${D}/${QTBASE}
-	fi
-
-	if use immqt || use immqt-bc ; then
-		dodoc ${S}/README.immodule
-	fi
-
-	# misc build reqs
-	dodir ${QTBASE}/mkspecs
-	cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/
-
-	sed -e "s:${S}:${QTBASE}:g" \
-		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
-	# plugins
-	cd ${S}
-	plugins=`find plugins -name "lib*.so" -print`
-	for x in $plugins; do
-		insinto ${QTBASE}/`dirname $x`
-		doins $x
-	done
-}