Cosmetic changes.

Package-Manager: portage-2.0.51.19

3 files changed, 52 insertions, 59 deletions

diff --git a/dev-libs/qsa/Manifest b/dev-libs/qsa/Manifest
index a1992426927d..b8cf277c2162 100644
--- a/dev-libs/qsa/Manifest
+++ b/dev-libs/qsa/Manifest
@@ -1,17 +1,17 @@
-MD5 69db44e49a1475b64c100ce886e8ea50 qsa-1.0.1.ebuild 837
-MD5 f309bfe6442cffa328a5f942583d8e93 metadata.xml 156
-MD5 6983241c2de0bc1bf7f5852494b29b18 ChangeLog 1615
+MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
 MD5 d6d4c8dcadd1da5194c35c20f3877ca1 qsa-1.0.0.ebuild 837
-MD5 b4f16a5683942f204576ea3ef0f0b453 qsa-1.1.1.ebuild 3647
-MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.1-no-examples.diff 219
-MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.1-sandbox-fix.diff 319
+MD5 467edd78c424943d5b6b00ca466f4c65 qsa-1.1.1.ebuild 3065
+MD5 6983241c2de0bc1bf7f5852494b29b18 ChangeLog 1615
+MD5 69db44e49a1475b64c100ce886e8ea50 qsa-1.0.1.ebuild 837
+MD5 9fc85dd703ee431b2f4bfa481eb71a7a files/qsa-1.1.1-example-enums.pro.diff 176
+MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.1.1-sandbox-fix.diff 319
+MD5 40102ad29fae0f586b3e6116374627ef files/digest-qsa-1.0.0 71
 MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.0-no-examples.diff 219
+MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.1-no-examples.diff 219
 MD5 8bf3644f3cf676dd01aa6fc8491e7717 files/qsa-1.1.1-without-examples.diff 219
-MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.0-sandbox-fix.diff 319
 MD5 abd2e3131c8059288ea1a4fd3c22d111 files/qsa-1.1.1-with-examples.diff 228
-MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.1.1-sandbox-fix.diff 319
 MD5 ca16b65adf6eb4f7456794cd9ca8ecb1 files/qsa-1.1.1-without-examples-using-ide.diff 149
+MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.1-sandbox-fix.diff 319
 MD5 fe73ba57a09b3fa2df9a8fc2225d9a7b files/digest-qsa-1.1.1 71
-MD5 9fc85dd703ee431b2f4bfa481eb71a7a files/qsa-1.1.1-example-enums.pro.diff 176
+MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.0-sandbox-fix.diff 319
 MD5 6a32e03879c62fd776070a687ae3d9a2 files/digest-qsa-1.0.1 71
-MD5 40102ad29fae0f586b3e6116374627ef files/digest-qsa-1.0.0 71
diff --git a/dev-libs/qsa/metadata.xml b/dev-libs/qsa/metadata.xml
index bdd2f3c13c5c..dc439f7e84f5 100644
--- a/dev-libs/qsa/metadata.xml
+++ b/dev-libs/qsa/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>qt</herd>
 </pkgmetadata>
diff --git a/dev-libs/qsa/qsa-1.1.1.ebuild b/dev-libs/qsa/qsa-1.1.1.ebuild
index 43f31fc842cb..044bb5536ae1 100644
--- a/dev-libs/qsa/qsa-1.1.1.ebuild
+++ b/dev-libs/qsa/qsa-1.1.1.ebuild
@@ -1,40 +1,46 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.1.ebuild,v 1.2 2005/02/08 11:51:49 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.1.ebuild,v 1.3 2005/05/27 13:56:16 greg_g Exp $
 
 inherit eutils kde-functions
 
 S="${WORKDIR}/${PN}-x11-free-${PV}"
-DESCRIPTION="QSA version ${PV}, Qt Script for Application is a ECMAScript based language
-to provide a scripting engine to applications developped with Qt"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+
+DESCRIPTION="Qt Script for Applications, a ECMAScript based scripting toolkit for making customizable Qt/C++ applications."
 SRC_URI="ftp://ftp.trolltech.com/qsa/source/${PN}-x11-free-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
-DEPEND=">=x11-libs/qt-3.1.2-r3"
-IUSE="threads examples ide doc"
+LICENSE="GPL-2"
 
-set-qtdir 3.1
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc examples ide threads"
+
+need-qt 3
 
 src_compile() {
-	QSACONFOPT=""
+	local myconf="-prefix ${D}${QTDIR}"
+
+	use threads && myconf="${myconf} -thread"
+
+	if ! use ide; then
+		myconf="${myconf} -no-ide"
+		epatch ${FILESDIR}/${P}-without-examples-using-ide.diff
+	fi
 
-	use thread && QSACONFOPT="-thread"
-	! use ide && QSACONFOPT="${QSACONFOPT} -no-ide" && epatch ${FILESDIR}/${P}-without-examples-using-ide.diff
-	use examples && einfo "Building QSA with examples" && epatch ${FILESDIR}/${P}-with-examples.diff && epatch ${FILESDIR}/${P}-example-enums.pro.diff || (einfo "Building QSA without examples" && epatch ${FILESDIR}/${P}-without-examples.diff)
+	if use examples; then
+		epatch ${FILESDIR}/${P}-with-examples.diff
+		epatch ${FILESDIR}/${P}-example-enums.pro.diff
+	else
+		epatch ${FILESDIR}/${P}-without-examples.diff
+	fi
 
 	epatch ${FILESDIR}/${P}-sandbox-fix.diff
 
-	einfo "Configure QSA with ${QSACONFOPT} in Root dir: ${QTDIR} (command: ./configure -prefix ${QTDIR} ${QSACONFOPT})"
-	./configure -prefix ${D}${QTDIR} ${QSACONFOPT} || die
+	./configure ${myconf} || die
 	emake || die
 }
 
 src_install() {
-
-	sed -e "s:${S}:${QTBASE}:g" ${S}/.qmake.cache > ${D}/${QTBASE}/.qmake.cache
-
 	into ${QTDIR}
 
 	#includes
@@ -52,12 +58,10 @@ src_install() {
 	doins src/qsa/qsinputdialogfactory.h
 	doins src/ide/qsworkbench.h
 
-
 	#QSA mkspec feature
 	insinto ${QTDIR}/mkspecs/${QMAKESPEC}
 	doins src/qsa/qsa.prf
 
-
 	#libs
 	dolib lib/libqsa.so.1.1.1
 	cd ${D}/${QTDIR}/lib
@@ -68,52 +72,42 @@ src_install() {
 	insinto ${QTDIR}/lib
 	doins lib/libqsa.prl
 
-
 	#QSA plugin (SEditor) for Qt designer 
 	insinto ${QTDIR}/plugins/designer
 	doins plugins/designer/libqseditorplugin.so
 
-
-	DIR4DOC=/usr/share/doc/${PF}
-
 	#documentation
 	if use doc; then
-	    dohtml -r doc/html/*
-	    insinto ${DIR4DOC}/html
-	    doins doc/html/qsa.dcf
-	    doins doc/html/extensions.dcf
-	    doins doc/html/language.dcf
-	    doins doc/html/qtscripter.dcf
-	    doins doc/html/qt-script-for-applications.dcf
+		dohtml -A dcf -r doc/html/*
 	fi
 
 	#examples
 	if use examples; then
-	    cp -R examples ${D}${DIR4DOC}/examples
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 
-	insinto ${DIR4DOC}
-	doins INSTALL README LICENSE.GPL changes-1.1.1
+	dodoc README changes-1.1.1
 }
 
 pkg_postinst(){
-	if use doc; then
-	    #include QSA Documentation content file into assistant
-	    assistant -addContentFile /usr/share/doc/${PF}/html/qsa.dcf
-	    assistant -addContentFile /usr/share/doc/${PF}/html/extensions.dcf
-	    assistant -addContentFile /usr/share/doc/${PF}/html/language.dcf
-	    assistant -addContentFile /usr/share/doc/${PF}/html/qtscripter.dcf
-	    assistant -addContentFile /usr/share/doc/${PF}/html/qt-script-for-applications.dcf
+	if use doc && [ "${ROOT}" = "/" ]; then
+		#include QSA Documentation content file into assistant
+		assistant -addContentFile /usr/share/doc/${PF}/html/qsa.dcf
+		assistant -addContentFile /usr/share/doc/${PF}/html/extensions.dcf
+		assistant -addContentFile /usr/share/doc/${PF}/html/language.dcf
+		assistant -addContentFile /usr/share/doc/${PF}/html/qtscripter.dcf
+		assistant -addContentFile /usr/share/doc/${PF}/html/qt-script-for-applications.dcf
 	fi
 }
 
 pkg_prerm(){
-	if use doc; then
-	    #remove QSA Documentation content file into assistant
-	    assistant -removeContentFile /usr/share/doc/${PF}/html/qsa.dcf
-	    assistant -removeContentFile /usr/share/doc/${PF}/html/extensions.dcf
-	    assistant -removeContentFile /usr/share/doc/${PF}/html/language.dcf
-	    assistant -removeContentFile /usr/share/doc/${PF}/html/qtscripter.dcf
-	    assistant -removeContentFile /usr/share/doc/${PF}/html/qt-script-for-applications.dcf
+	if use doc && [ "${ROOT}" = "/" ]; then
+		#remove QSA Documentation content file into assistant
+		assistant -removeContentFile /usr/share/doc/${PF}/html/qsa.dcf
+		assistant -removeContentFile /usr/share/doc/${PF}/html/extensions.dcf
+		assistant -removeContentFile /usr/share/doc/${PF}/html/language.dcf
+		assistant -removeContentFile /usr/share/doc/${PF}/html/qtscripter.dcf
+		assistant -removeContentFile /usr/share/doc/${PF}/html/qt-script-for-applications.dcf
 	fi
 }