new: x11-libs/qt-3.0.1 ebuild; app-doc/qt-docs 2.3.1 and 3.0.1 ebuilds.

also a few fixes for misc stuff.

12 files changed, 309 insertions, 23 deletions

diff --git a/app-cdr/koncd/koncd-1.0_rc1.ebuild b/app-cdr/koncd/koncd-1.0_rc1.ebuild
index 8864aa66d1bf..bf69c5f624a2 100644
--- a/app-cdr/koncd/koncd-1.0_rc1.ebuild
+++ b/app-cdr/koncd/koncd-1.0_rc1.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/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.5 2001/12/27 19:01:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.6 2001/12/30 17:29:05 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
@@ -14,10 +14,4 @@ HOMEPAGE="http://www.koncd.org/"
 
 newdepend ">=app-cdr/cdrtools-1.11"
 
-src_unpack() {
-    base_src_unpack
-}
-
-
-
 
diff --git a/app-cdr/kreatecd/kreatecd-1.1.0.ebuild b/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
index 12e1cf6b5fff..061f54904041 100644
--- a/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
+++ b/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kreatecd/kreatecd-1.1.0.ebuild,v 1.2 2001/12/23 21:35:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kreatecd/kreatecd-1.1.0.ebuild,v 1.3 2001/12/30 17:29:05 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
@@ -12,6 +12,6 @@ SRC_URI="http://prdownloads.sourceforge.net/kreatecd/${P}.tar.bz2"
 HOMEPAGE="http://www.kreatecd.de"
 
 DEPEND="$DEPEND
-			>=media-sound/mpg123-0.59
-			>=media-sound/cdparanoia-3.9.8"
+	>=media-sound/mpg123-0.59
+	>=media-sound/cdparanoia-3.9.8"
 newdepend ">=app-cdr/cdrtools-1.11"
diff --git a/app-doc/qt-docs/files/45qt-docs3 b/app-doc/qt-docs/files/45qt-docs3
new file mode 100644
index 000000000000..d4ae10decfa6
--- /dev/null
+++ b/app-doc/qt-docs/files/45qt-docs3
@@ -0,0 +1 @@
+MANPATH=/usr/qt/3/man
diff --git a/app-doc/qt-docs/files/50qt-docs2 b/app-doc/qt-docs/files/50qt-docs2
new file mode 100644
index 000000000000..c6456a35cbca
--- /dev/null
+++ b/app-doc/qt-docs/files/50qt-docs2
@@ -0,0 +1 @@
+MANPATH=/usr/qt/2/man
diff --git a/app-doc/qt-docs/files/digest-qt-docs-2.3.1 b/app-doc/qt-docs/files/digest-qt-docs-2.3.1
new file mode 100644
index 000000000000..90a2d69a7095
--- /dev/null
+++ b/app-doc/qt-docs/files/digest-qt-docs-2.3.1
@@ -0,0 +1 @@
+MD5 358d6dfbcbdc353b65b5236866b0f3a7 qt-x11-2.3.1.tar.gz 8970240
diff --git a/app-doc/qt-docs/files/digest-qt-docs-3.0.1 b/app-doc/qt-docs/files/digest-qt-docs-3.0.1
new file mode 100644
index 000000000000..6b90fbad670c
--- /dev/null
+++ b/app-doc/qt-docs/files/digest-qt-docs-3.0.1
@@ -0,0 +1 @@
+MD5 cf9afb61d08396c7ca9a290fc7567e92 qt-x11-free-3.0.1.tar.gz 17821696
diff --git a/app-doc/qt-docs/qt-docs-2.3.1.ebuild b/app-doc/qt-docs/qt-docs-2.3.1.ebuild
new file mode 100644
index 000000000000..6d4e889fceeb
--- /dev/null
+++ b/app-doc/qt-docs/qt-docs-2.3.1.ebuild
@@ -0,0 +1,89 @@
+# 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/app-doc/qt-docs/qt-docs-2.3.1.ebuild,v 1.1 2001/12/30 17:29:05 danarmak Exp $
+
+S=${WORKDIR}/qt-${PV}
+DESCRIPTION="QT ${PV} docs, manpages, examples and tutorials"
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
+HOMEPAGE="http://www.trolltech.com/"
+
+RDEPEND=">=x11-libs/qt-$PV"
+
+DEPEND="$RDEPEND
+	sys-devel/gcc"
+
+export QTDIR=${S}
+
+src_unpack() {
+
+    unpack ${A}
+
+    cd ${S}
+    cp configure configure.orig
+    sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure
+
+    cd ${S}/configs
+    cp linux-g++-shared linux-g++-shared.orig
+    sed -e "s/SYSCONF_CXXFLAGS	/SYSCONF_CXXFLAGS = ${CXXFLAGS} \#/" \
+	-e "s/SYSCONF_CFLAGS	/SYSCONF_CFLAGS = ${CFLAGS} \#/" \
+	linux-g++-shared.orig > linux-g++-shared || die
+
+}
+
+src_compile() {
+
+    export LDFLAGS="$LDFLAGS -ldl"
+    local myconf
+
+    use opengl							|| myconf="$myconf -no-opengl"
+    use nas	&& myconf="${myconf} -system-nas-sound"		|| myconf="${myconf} -no-nas-sound"
+    use gif	&& myconf="${myconf} -gif"
+    [ -n "$DEBUG" ]	&& myconf="${myconf} -debug"		|| myconf="${myconf} -release"
+
+    ./configure -sm -thread -system-zlib -system-jpeg ${myconf} \
+	-system-libmng -system-libpng -gif -platform linux-g++ \
+        -ldl -lpthread -no-g++-exceptions || die
+
+    # use already built x11-libs/qt
+    export QTDIR=/usr/qt/2
+
+	cd ${S}/tutorial
+    make || die
+    cd ${S}/examples
+    make || die
+
+}
+
+src_install() {
+
+    QTBASE=/usr/qt/2
+    cd ${S}
+    
+    # docs
+    cd ${S}
+    dodoc ANNOUNCE README* INSTALL FAQ LICENSE* PLATFORMS PORTING
+
+    # html docs
+    dodir $QTBASE/doc
+    cp -r ${S}/doc/html $D/$QTBASE/doc
+
+    # manpages
+    dodir $QTBASE/man
+    cp -r ${S}/doc/man $D/$QTBASE
+
+    # examples
+    cp -r ${S}/examples $D/$QTBASE
+
+    # tutorials
+    cp -r ${S}/tutorial $D/$QTBASE
+    
+    # misc
+    insinto /etc/env.d
+    doins ${FILESDIR}/50qt-docs2
+
+}
+
+
+
+
diff --git a/app-doc/qt-docs/qt-docs-3.0.1.ebuild b/app-doc/qt-docs/qt-docs-3.0.1.ebuild
new file mode 100644
index 000000000000..7ae630ea6a06
--- /dev/null
+++ b/app-doc/qt-docs/qt-docs-3.0.1.ebuild
@@ -0,0 +1,91 @@
+# 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/app-doc/qt-docs/qt-docs-3.0.1.ebuild,v 1.1 2001/12/30 17:29:05 danarmak Exp $
+
+P=qt-x11-${PV}
+S=${WORKDIR}/qt-x11-free-${PV}
+
+DESCRIPTION="QT version ${PV}"
+
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-${PV}.tar.gz"
+HOMEPAGE="http://www.trolltech.com/"
+
+DEPEND=">=x11-libs/qt-$PV"
+
+RDEPEND="$DEPEND sys-devel/gcc"
+
+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
+
+    cd ${S}
+    mv tools/assistant/helpdialogimpl.cpp tools/assistant/helpdialogimpl.cpp_orig
+    sed -e 's:"/doc/html:"/share/doc/html:g' \
+    	tools/assistant/helpdialogimpl.cpp_orig > tools/assistant/helpdialogimpl.cpp
+    mv tools/assistant/mainwindow.ui.h tools/assistant/mainwindow.ui.h_orig
+    sed -e 's:"/doc/html:"/share/doc/html:g' \
+    	tools/assistant/mainwindow.ui.h_orig > tools/assistant/mainwindow.ui.h
+
+}
+
+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 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 || die
+
+	# use already built qt
+	export QTDIR=/usr/qt/3
+
+	# what's with the make doc target? it wants an executable qdoc in the path, and I haven't
+	# been able to find it. FIXME!
+	#cd ${S}
+	#make doc || die
+	cd ${S}/tutorial
+	make || die
+	cd ${S}/examples
+	make || die
+
+}
+
+src_install() {
+
+    cd ${S}
+    
+    # misc
+    insinto /etc/env.d
+    doins ${FILESDIR}/45qt-docs3
+
+	# docs
+	cd ${S}/doc
+	dodir ${QTBASE}/doc
+	for x in html flyers; do
+		cp -r $x ${D}/${QTBASE}/doc
+	done
+
+	# manpages
+	cp -r ${S}/doc/man ${D}/${QTBASE}
+
+	# examples
+	cp -r ${S}/examples ${D}/${QTBASE}
+
+	# tutorials
+	cp -r ${S}/tutorial ${D}/${QTBASE}
+
+}
+
+
diff --git a/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild b/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
index 5128773bd358..387c75b10949 100644
--- a/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
+++ b/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild,v 1.1 2001/10/06 17:22:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r3.ebuild,v 1.2 2001/12/30 17:29:05 danarmak Exp $
 
 S=${WORKDIR}/xmms-aalsa_0.5.4
-DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
+DESCRIPTION="This output plugin allows xmms to work with alsa"
 SRC_URI="http://www1.tcnet.ne.jp/fmurata/linux/aalsa/xmms-aalsa_0.5.4.tar.gz"
 
 DEPEND="virtual/glibc >=media-sound/xmms-1.2.5-r1 >=media-libs/alsa-lib-0.5.9"
diff --git a/net-misc/kift/kift-0.7.0.ebuild b/net-misc/kift/kift-0.7.0.ebuild
index d57e5b71b935..d1d11781d444 100644
--- a/net-misc/kift/kift-0.7.0.ebuild
+++ b/net-misc/kift/kift-0.7.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kift/kift-0.7.0.ebuild,v 1.2 2001/12/23 21:35:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kift/kift-0.7.0.ebuild,v 1.3 2001/12/30 17:29:05 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
 need-kde 2.1
 
-
 DESCRIPTION="KDE interface for giFT"
 HOMEPAGE="http://kift.sourceforge.net"
 
diff --git a/x11-libs/qt/qt-2.3.1.ebuild b/x11-libs/qt/qt-2.3.1.ebuild
index a8969c5095c4..fc7b45a02b80 100644
--- a/x11-libs/qt/qt-2.3.1.ebuild
+++ b/x11-libs/qt/qt-2.3.1.ebuild
@@ -1,19 +1,23 @@
 # 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.1 2001/12/29 17:41:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.1.ebuild,v 1.2 2001/12/30 17:29:05 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
 
-DEPEND=">=media-libs/libpng-1.0.9
+RDEPEND=">=media-libs/libpng-1.0.9
 	>=media-libs/libmng-1.0.0
 	opengl? ( virtual/opengl virtual/glu )
 	nas? ( >=media-libs/nas-1.4.1 )
 	virtual/x11"
 
+DEPEND="$RDEPEND
+	sys-devel/gcc"
+
+QTBASE=/usr/qt/2
 export QTDIR=${S}
 
 src_unpack() {
@@ -40,7 +44,7 @@ src_compile() {
     use opengl							|| myconf="$myconf -no-opengl"
     use nas	&& myconf="${myconf} -system-nas-sound"		|| myconf="${myconf} -no-nas-sound"
     use gif	&& myconf="${myconf} -gif"
-    "$DEBUG"	&& myconf="${myconf} -debug"			|| myconf="${myconf} -release"
+    [ -n "$DEBUG" ]	&& myconf="${myconf} -debug"		|| myconf="${myconf} -release"
 	
     ./configure -sm -thread -system-zlib -system-jpeg ${myconf} \
 	-system-libmng -system-libpng -gif -platform linux-g++ \
@@ -53,17 +57,14 @@ src_compile() {
 
 src_install() {
 
-    QTBASE=/usr/qt/2
     cd ${S}
-    
+
     # binaries
     into $QTBASE
     dobin bin/*
 
     # libraries
     dolib lib/libqt.so.${PV} lib/libqt-mt.so.${PV} lib/libqutil.so.1.0.0
-    # doesn't create all necessary symlinks :-(
-    #preplib $QTBASE
     cd ${D}$QTBASE/lib
     for x in libqt.so libqt-mt.so
     do
@@ -74,12 +75,12 @@ src_install() {
     ln -s libqutil.so.1.0.0 libqutil.so.1.0
     ln -s libqutil.so.1.0 libqutil.so.1
     ln -s libqutil.so.1 libqutil.so
-    
+
     # includes
     cd ${S}
     dodir ${QTBASE}/include
     cp include/* ${D}/${QTBASE}/include/
-    
+
     # misc
     insinto /etc/env.d
     doins ${FILESDIR}/50qt2
diff --git a/x11-libs/qt/qt-3.0.1.ebuild b/x11-libs/qt/qt-3.0.1.ebuild
new file mode 100644
index 000000000000..f76977fe467e
--- /dev/null
+++ b/x11-libs/qt/qt-3.0.1.ebuild
@@ -0,0 +1,108 @@
+# 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.ebuild,v 1.1 2001/12/30 17:29:05 danarmak Exp $
+
+P=qt-x11-${PV}
+S=${WORKDIR}/qt-x11-free-${PV}
+
+DESCRIPTION="QT version ${PV}"
+
+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 )
+	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
+
+    cd ${S}
+    mv tools/assistant/helpdialogimpl.cpp tools/assistant/helpdialogimpl.cpp_orig
+    sed -e 's:"/doc/html:"/share/doc/html:g' \
+    	tools/assistant/helpdialogimpl.cpp_orig > tools/assistant/helpdialogimpl.cpp
+    mv tools/assistant/mainwindow.ui.h tools/assistant/mainwindow.ui.h_orig
+    sed -e 's:"/doc/html:"/share/doc/html:g' \
+    	tools/assistant/mainwindow.ui.h_orig > tools/assistant/mainwindow.ui.h
+	
+}
+
+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 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 || 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}/50qt2
+
+    # 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
+
+}