split the env.d file, this way QT3 comes firts in the path and sets QTDIR too. just like the kdelibs

commit from half an hour ago.
author: Dan Armak <danarmak@gentoo.org> 2002-03-24 22:48:37 +0000
committer: Dan Armak <danarmak@gentoo.org> 2002-03-24 22:48:37 +0000
commit: d7b2baf95390fe7eee8a64ddbaa1692a1224998a (patch)
tree: f6b2d59e247f13b1d5d5182a2d0ed8a87c3a03ef /x11-libs
parent: small tweak (diff)
download: historical-d7b2baf95390fe7eee8a64ddbaa1692a1224998a.tar.gz
historical-d7b2baf95390fe7eee8a64ddbaa1692a1224998a.tar.bz2
historical-d7b2baf95390fe7eee8a64ddbaa1692a1224998a.zip
11 files changed, 14 insertions, 111 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 5577e98e5351..e0a29618e7d3 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.3 2002/03/02 21:02:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.4 2002/03/24 22:48:37 danarmak Exp $
+
+*qt-3.0.2-r1, qt-2.3.1-r1 (24 Mar 2002)
+
+  24 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Split the env.d file for each of the above ebuilds into a qt and a qtdir
+  file. This way QT3 comes first in PATH, and QTDIr gets set to the qt3 value.
 
 *qt-3.0.2 (2 Mar 2002)
 
diff --git a/x11-libs/qt/files/45qt3 b/x11-libs/qt/files/45qt3
index 25a0240bea76..75edf3b0229f 100644
--- a/x11-libs/qt/files/45qt3
+++ b/x11-libs/qt/files/45qt3
@@ -1,5 +1,4 @@
 PATH=/usr/qt/3/bin
 ROOTPATH=/usr/qt/3/bin
 LDPATH=/usr/qt/3/lib
-QTDIR=/usr/qt/3
 QMAKESPEC=linux-g++
diff --git a/x11-libs/qt/files/45qtdir2 b/x11-libs/qt/files/45qtdir2
new file mode 100644
index 000000000000..f457b03a76a0
--- /dev/null
+++ b/x11-libs/qt/files/45qtdir2
@@ -0,0 +1 @@
+QTDIR=/usr/qt/2
diff --git a/x11-libs/qt/files/50qt2 b/x11-libs/qt/files/50qt2
index f430db9f3828..4e021ff1fef1 100644
--- a/x11-libs/qt/files/50qt2
+++ b/x11-libs/qt/files/50qt2
@@ -1,4 +1,3 @@
 PATH=/usr/qt/2/bin
 ROOTPATH=/usr/qt/2/bin
 LDPATH=/usr/qt/2/lib
-QTDIR=/usr/qt/2
diff --git a/x11-libs/qt/files/50qtdir3 b/x11-libs/qt/files/50qtdir3
new file mode 100644
index 000000000000..d41d81cc0f50
--- /dev/null
+++ b/x11-libs/qt/files/50qtdir3
@@ -0,0 +1 @@
+QTDIR=/usr/qt/3
diff --git a/x11-libs/qt/files/digest-qt-2.3.1 b/x11-libs/qt/files/digest-qt-2.3.1-r1
index 0541e1798980..0541e1798980 100644
--- a/x11-libs/qt/files/digest-qt-2.3.1
+++ b/x11-libs/qt/files/digest-qt-2.3.1-r1
diff --git a/x11-libs/qt/files/digest-qt-3.0.1-r3 b/x11-libs/qt/files/digest-qt-3.0.1-r3
deleted file mode 100644
index 2f3afacc4dc5..000000000000
--- a/x11-libs/qt/files/digest-qt-3.0.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf9afb61d08396c7ca9a290fc7567e92 qt-x11-free-3.0.1.tar.gz 17818374
diff --git a/x11-libs/qt/files/digest-qt-3.0.2 b/x11-libs/qt/files/digest-qt-3.0.2-r1
index 867ff4ee2ac1..867ff4ee2ac1 100644
--- a/x11-libs/qt/files/digest-qt-3.0.2
+++ b/x11-libs/qt/files/digest-qt-3.0.2-r1
diff --git a/x11-libs/qt/qt-2.3.1.ebuild b/x11-libs/qt/qt-2.3.1-r1.ebuild
index 72b1846af114..207e3765dda8 100644
--- a/x11-libs/qt/qt-2.3.1.ebuild
+++ b/x11-libs/qt/qt-2.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.1.ebuild,v 1.4 2002/02/10 17:52:41 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.1-r1.ebuild,v 1.1 2002/03/24 22:48:37 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
@@ -83,7 +83,7 @@ src_install() {
 
     # misc
     insinto /etc/env.d
-    doins ${FILESDIR}/50qt2
+    doins ${FILESDIR}/{50qt2,45qtdir2}
 
 }
 
diff --git a/x11-libs/qt/qt-3.0.1-r3.ebuild b/x11-libs/qt/qt-3.0.1-r3.ebuild
deleted file mode 100644
index a28d0f171275..000000000000
--- a/x11-libs/qt/qt-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.1-r3.ebuild,v 1.5 2002/02/17 19:16:44 danarmak Exp $
-
-P=qt-x11-${PV}
-S=${WORKDIR}/qt-x11-free-${PV}
-
-DESCRIPTION="QT version ${PV}"
-SLOT="3"
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-${PV}.tar.gz"
-HOMEPAGE="http://www.trolltech.com/"
-
-DEPEND=">=media-libs/libpng-1.0.9
-	>=media-libs/libmng-1.0.0
-	opengl? ( virtual/opengl virtual/glu )
-	nas? ( >=media-libs/nas-1.4.1 )
-	mysql? ( >=dev-db/mysql-3.2.10 )
-	postgres? ( =dev-db/postgresql-7.1.3* )
-	odbc? ( >=dev-db/unixODBC-2.0 )
-	virtual/x11"
-
-QTBASE=/usr/qt/3
-export QTDIR=${S}
-
-src_unpack() {
-
-    unpack ${A}
-
-    cd ${S}
-    cp configure configure.orig
-    sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure
-
-}
-
-src_compile() {
-
-	export LDFLAGS="-ldl"
-
-	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/lib/mysql"
-	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql -I/usr/include/postgresql/libpq -L/usr/lib"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
-
-	./configure -sm -thread -stl -system-zlib -system-libjpeg ${myconf} \
-		-system-libmng -system-libpng -ldl -lpthread -xft || die
-
-	emake src-qmake src-moc sub-src sub-tools || die
-
-}
-
-src_install() {
-
-    cd ${S}
-
-    # binaries
-    into $QTBASE
-    dobin bin/*
-
-    # libraries
-    dolib lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0 lib/libeditor.so.1.0.0
-    cd ${D}$QTBASE/lib
-    for x in libqui.so libeditor.so
-    do
-	ln -s $x.1.0.0 $x.1.0
-	ln -s $x.1.0 $x.1
-	ln -s $x.1 $x
-    done
-    ln -s libqt-mt.so.3.0.1 libqt-mt.so.3.0
-    ln -s libqt-mt.so.3.0 libqt-mt.so.3
-    ln -s libqt-mt.so.3 libqt-mt.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
-
-    # misc build reqs
-    dodir ${QTBASE}/mkspecs
-    cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
-
-    sed -e "s:${D}::g" \
-    	-e "s:qt-x11-free-3.0.1::g" \
-	-e "s:${WORKDIR}:${QTBASE}:" \
-	-e "s:/usr/local/qt:${QTBASE}:" \
-	${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
-
-}
diff --git a/x11-libs/qt/qt-3.0.2.ebuild b/x11-libs/qt/qt-3.0.2-r1.ebuild
index 01fc7649cd7f..7cadbd9d5b04 100644
--- a/x11-libs/qt/qt-3.0.2.ebuild
+++ b/x11-libs/qt/qt-3.0.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.2.ebuild,v 1.2 2002/03/15 11:47:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.2-r1.ebuild,v 1.1 2002/03/24 22:48:37 danarmak Exp $
 
 P=qt-x11-${PV}
 S=${WORKDIR}/qt-x11-free-${PV}
@@ -92,7 +92,7 @@ src_install() {
 
     # misc
     insinto /etc/env.d
-    doins ${FILESDIR}/45qt3
+    doins ${FILESDIR}/{45qt3,50qtdir3}
 
     # misc build reqs
     dodir ${QTBASE}/mkspecs
author	Dan Armak <danarmak@gentoo.org>	2002-03-24 22:48:37 +0000
committer	Dan Armak <danarmak@gentoo.org>	2002-03-24 22:48:37 +0000
commit	d7b2baf95390fe7eee8a64ddbaa1692a1224998a (patch)
tree	f6b2d59e247f13b1d5d5182a2d0ed8a87c3a03ef /x11-libs
parent	small tweak (diff)
download	historical-d7b2baf95390fe7eee8a64ddbaa1692a1224998a.tar.gz historical-d7b2baf95390fe7eee8a64ddbaa1692a1224998a.tar.bz2 historical-d7b2baf95390fe7eee8a64ddbaa1692a1224998a.zip