New version, many changes - see bug #65154

10 files changed, 174 insertions, 6 deletions

diff --git a/dev-libs/qsa/ChangeLog b/dev-libs/qsa/ChangeLog
index a27e803e9512..e5d74d04f2d9 100644
--- a/dev-libs/qsa/ChangeLog
+++ b/dev-libs/qsa/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/qsa
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.8 2004/06/24 23:32:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.9 2004/09/30 00:46:42 caleb Exp $
+
+*qsa-1.1.1 (29 Sep 2004)
+
+  29 Sep 2004; Caleb Tennis <caleb@gentoo.org> metadata.xml,
+  +files/qsa-1.1.1-example-enums.pro.diff,
+  +files/qsa-1.1.1-sandbox-fix.diff, +files/qsa-1.1.1-with-examples.diff,
+  +files/qsa-1.1.1-without-examples-using-ide.diff,
+  +files/qsa-1.1.1-without-examples.diff, +qsa-1.1.1.ebuild:
+  Importing new version - Bug #65154
 
 *qsa-1.0.1 (28 Nov 2003)
 
diff --git a/dev-libs/qsa/Manifest b/dev-libs/qsa/Manifest
index 567359be7a36..f7a8168370a4 100644
--- a/dev-libs/qsa/Manifest
+++ b/dev-libs/qsa/Manifest
@@ -1,10 +1,17 @@
 MD5 04176c4b70fec21b634d5d71edc13f1f qsa-1.0.1.ebuild 841
+MD5 151a2f7d97b85b9ead6592ff239e3ead qsa-1.1.1.ebuild 3640
 MD5 f35f5d2ef8a06a74240ced2d4efa13fe qsa-1.0.0.ebuild 840
-MD5 ff29c789ddf7af9a690d3b3683f637d1 ChangeLog 999
-MD5 34c522a277c81942598b1dc6872b4caf metadata.xml 219
+MD5 f6d6017cb7745260fcef2fc0d7cf317d ChangeLog 1351
+MD5 f309bfe6442cffa328a5f942583d8e93 metadata.xml 156
 MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.1-no-examples.diff 219
+MD5 9fc85dd703ee431b2f4bfa481eb71a7a files/qsa-1.1.1-example-enums.pro.diff 176
+MD5 8bf3644f3cf676dd01aa6fc8491e7717 files/qsa-1.1.1-without-examples.diff 219
+MD5 ca16b65adf6eb4f7456794cd9ca8ecb1 files/qsa-1.1.1-without-examples-using-ide.diff 149
 MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.0-sandbox-fix.diff 319
 MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.0-no-examples.diff 219
+MD5 abd2e3131c8059288ea1a4fd3c22d111 files/qsa-1.1.1-with-examples.diff 228
 MD5 40102ad29fae0f586b3e6116374627ef files/digest-qsa-1.0.0 71
 MD5 6a32e03879c62fd776070a687ae3d9a2 files/digest-qsa-1.0.1 71
+MD5 fe73ba57a09b3fa2df9a8fc2225d9a7b files/digest-qsa-1.1.1 71
 MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.0.1-sandbox-fix.diff 319
+MD5 b4f80b2107bf151f4232a2e25290ff9f files/qsa-1.1.1-sandbox-fix.diff 319
diff --git a/dev-libs/qsa/files/digest-qsa-1.1.1 b/dev-libs/qsa/files/digest-qsa-1.1.1
new file mode 100644
index 000000000000..68573734e3a2
--- /dev/null
+++ b/dev-libs/qsa/files/digest-qsa-1.1.1
@@ -0,0 +1 @@
+MD5 25a50ba29ee4a1dc528adc5011c29c2b qsa-x11-free-1.1.1.tar.gz 1715187
diff --git a/dev-libs/qsa/files/qsa-1.1.1-example-enums.pro.diff b/dev-libs/qsa/files/qsa-1.1.1-example-enums.pro.diff
new file mode 100644
index 000000000000..66b4b1318847
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.1.1-example-enums.pro.diff
@@ -0,0 +1,5 @@
+--- examples/enums/enums.pro.orig	2004-09-23 12:20:14.000000000 +0200
++++ examples/enums/enums.pro	2004-09-23 16:25:35.000000000 +0200
+@@ -1,1 +1,1 @@
+-load(qsa)
++load(../qsa)
diff --git a/dev-libs/qsa/files/qsa-1.1.1-sandbox-fix.diff b/dev-libs/qsa/files/qsa-1.1.1-sandbox-fix.diff
new file mode 100644
index 000000000000..3ee14bb3ee0c
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.1.1-sandbox-fix.diff
@@ -0,0 +1,11 @@
+--- src/plugin/plugin.pro.orig	2003-07-03 13:43:09.000000000 +0200
++++ src/plugin/plugin.pro	2003-07-03 13:43:34.000000000 +0200
+@@ -14,7 +14,7 @@
+ }
+ 
+ !isEmpty(QSA_INSTALL_PREFIX)
+-  target.path=$$plugins.path/designer
++  target.path=$$QSA_INSTALL_PREFIX/plugins/designer
+ 
+ INSTALLS    += target
+ TEMPLATE     = lib
diff --git a/dev-libs/qsa/files/qsa-1.1.1-with-examples.diff b/dev-libs/qsa/files/qsa-1.1.1-with-examples.diff
new file mode 100644
index 000000000000..d57ed70fad04
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.1.1-with-examples.diff
@@ -0,0 +1,7 @@
+--- qsa.pro.orig	2003-07-02 12:16:55.000000000 +0200
++++ qsa.pro	2003-07-03 13:42:53.000000000 +0200
+@@ -1,3 +1,3 @@
+ TEMPLATE	= subdirs
+ CONFIG		= ordered
+-SUBDIRS 	= src examples
++SUBDIRS 	= configure2 src examples src/plugin
diff --git a/dev-libs/qsa/files/qsa-1.1.1-without-examples-using-ide.diff b/dev-libs/qsa/files/qsa-1.1.1-without-examples-using-ide.diff
new file mode 100644
index 000000000000..c8f32b91d59b
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.1.1-without-examples-using-ide.diff
@@ -0,0 +1,5 @@
+--- examples/examples.pro.orig
++++ examples/examples.pro
+@@ -3,1 +3,1 @@
+-	 	  console game filter wrappers enums
++	 	  console game filter wrappers
diff --git a/dev-libs/qsa/files/qsa-1.1.1-without-examples.diff b/dev-libs/qsa/files/qsa-1.1.1-without-examples.diff
new file mode 100644
index 000000000000..607d3d804e13
--- /dev/null
+++ b/dev-libs/qsa/files/qsa-1.1.1-without-examples.diff
@@ -0,0 +1,7 @@
+--- qsa.pro.orig	2003-07-02 12:16:55.000000000 +0200
++++ qsa.pro	2003-07-03 13:42:53.000000000 +0200
+@@ -1,3 +1,3 @@
+ TEMPLATE	= subdirs
+ CONFIG		= ordered
+-SUBDIRS 	= src examples
++SUBDIRS 	= configure2 src src/plugin
diff --git a/dev-libs/qsa/metadata.xml b/dev-libs/qsa/metadata.xml
index 330dc668d6ec..bdd2f3c13c5c 100644
--- a/dev-libs/qsa/metadata.xml
+++ b/dev-libs/qsa/metadata.xml
@@ -3,7 +3,4 @@
 
 <pkgmetadata>
 <herd>qt</herd>
-<maintainer>
-  <email>brain@gentoo.org</email>
-</maintainer>  
 </pkgmetadata>
diff --git a/dev-libs/qsa/qsa-1.1.1.ebuild b/dev-libs/qsa/qsa-1.1.1.ebuild
new file mode 100644
index 000000000000..a4f89cf4408b
--- /dev/null
+++ b/dev-libs/qsa/qsa-1.1.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2004 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.1 2004/09/30 00:46:42 caleb 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"
+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"
+
+set-qtdir 3.1
+
+src_compile() {
+	QSACONFOPT=""
+
+	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)
+
+	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
+	emake || die
+}
+
+src_install() {
+
+	sed -e "s:${S}:${QTBASE}:g" ${S}/.qmake.cache > ${D}/${QTBASE}/.qmake.cache
+
+	into ${QTDIR}
+
+	#includes
+	insinto ${QTDIR}/include
+	doins src/qsa/qsaglobal.h
+	doins src/qsa/qsconfig.h
+	doins src/qsa/qsargument.h
+	doins src/qsa/qsproject.h
+	doins src/qsa/qsinterpreter.h
+	doins src/qsa/qseditor.h
+	doins src/qsa/qsutilfactory.h
+	doins src/qsa/qswrapperfactory.h
+	doins src/qsa/qsobjectfactory.h
+	doins src/qsa/qsscript.h
+	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
+	ln -s libqsa.so.1.1.1 libqsa.so.1.1
+	ln -s libqsa.so.1.1 libqsa.so.1
+	ln -s libqsa.so.1 libqsa.so
+	cd -
+	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
+	fi
+
+	#examples
+	if use examples; then
+	    cp -R examples ${D}${DIR4DOC}/examples
+	fi
+
+	insinto ${DIR4DOC}
+	doins INSTALL README LICENSE.GPL 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
+	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
+	fi
+}