Ebuild cleanup - moved patching to src_unpack. Version bump to 1.1.5

Package-Manager: portage-2.1.2.2

diff --git a/dev-libs/qsa/ChangeLog b/dev-libs/qsa/ChangeLog
index f4d12e108882f8c00fb2dc91488e273c3a70ae40..9df60e085729a85a4a134b28f8565360b69dd5a4 100644 (file)
--- a/dev-libs/qsa/ChangeLog
+++ b/dev-libs/qsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/qsa
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.18 2007/02/22 01:10:08 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.19 2007/03/14 21:40:21 troll Exp $
+
+  14 Mar 2007; Przemysław Maciąg <troll@gentoo.org> qsa-1.0.1.ebuild,
+  qsa-1.1.1.ebuild, +qsa-1.1.5.ebuild:
+  Ebuilds cleanup - moved patching to src_unpack. Version bump to 1.1.5.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.

diff --git a/dev-libs/qsa/Manifest b/dev-libs/qsa/Manifest
index ce829279a3a17097cb223a42f3bb9c58d6251f11..b4e4bcc6fbb07b97544c37d4071225e70d499416 100644 (file)
--- a/dev-libs/qsa/Manifest
+++ b/dev-libs/qsa/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qsa-1.0.1-no-examples.diff 219 RMD160 bafd4b4e15e98352a3adc9a19d20b6af516ba671 SHA1 7d87b09d813d98cd904989be052f7c2de42141db SHA256 18fb256ae77147a6302ce7dbbf428765110f4d4b32d311abe1d5707eeaaabc1a
 MD5 005ebaeb3996a2a42c0440168a47d1d7 files/qsa-1.0.1-no-examples.diff 219
 RMD160 bafd4b4e15e98352a3adc9a19d20b6af516ba671 files/qsa-1.0.1-no-examples.diff 219
@@ -28,18 +31,23 @@ RMD160 246516e6d0ffd7390b6d8b1dc9b518f653ba7086 files/qsa-1.1.1-without-examples
 SHA256 15e262fc9c7a3cbdc6cf428ec1c59d7c8801def109ceaa4533f0d45af515e823 files/qsa-1.1.1-without-examples.diff 219
 DIST qsa-x11-free-1.0.1.tar.gz 2060183 RMD160 2a14085823cea0798f30e7ccb6d779721c2ee214 SHA1 c55b0094d13a3ba1a98386357e97bfff08971411 SHA256 4f0c40e8327e181fb8ec0bf5cd8d4370930ea915fed413bea3ed73bb4c9d9986
 DIST qsa-x11-free-1.1.1.tar.gz 1715187 RMD160 3a41740e94d2930f52d6217c7ad5f62aed6ae762 SHA1 5819d33396c9e76c1d4f7f3aecab664a52e79c08 SHA256 f52d7aa624296d1ca7ba135d14e2774a4c7cf3cedd9ef8ea072e77c310da9e26
-EBUILD qsa-1.0.1.ebuild 810 RMD160 5f914b401bbb2db29a685ba29aef01b2b4bb37b9 SHA1 427cff12ccb5e4a204cf3ef2b165f2388086e192 SHA256 7cd1545beb9832a1fde015539553eeace293e4b0d9c6f40d1b32332b813ad214
-MD5 76178da94ee8ad8aec31fdeae6d18809 qsa-1.0.1.ebuild 810
-RMD160 5f914b401bbb2db29a685ba29aef01b2b4bb37b9 qsa-1.0.1.ebuild 810
-SHA256 7cd1545beb9832a1fde015539553eeace293e4b0d9c6f40d1b32332b813ad214 qsa-1.0.1.ebuild 810
-EBUILD qsa-1.1.1.ebuild 3075 RMD160 d743d7a4d01f97ef5f8190257a82ca48ca3d9ace SHA1 ee1565849e43db275b40c0cb3d6451c4018a8b0f SHA256 0abeb24911d5dc8c6a984c51f47ad25f28c7310ce37333249cf3767eb331a027
-MD5 2b40b4584b1cd5d593ca01ca6051b927 qsa-1.1.1.ebuild 3075
-RMD160 d743d7a4d01f97ef5f8190257a82ca48ca3d9ace qsa-1.1.1.ebuild 3075
-SHA256 0abeb24911d5dc8c6a984c51f47ad25f28c7310ce37333249cf3767eb331a027 qsa-1.1.1.ebuild 3075
-MISC ChangeLog 2178 RMD160 adf2715734dd001f908f4c735535cf2142876b12 SHA1 eb9b471ac7feed5471748b19f6d8bbaadca2753e SHA256 cbe31ab1fa330cf6a0e7f48a74ca24cca20c78f7a921109e85cddf99c4ea6965
-MD5 cfd140e80b4bd9b05fa5d95ad4ebf90a ChangeLog 2178
-RMD160 adf2715734dd001f908f4c735535cf2142876b12 ChangeLog 2178
-SHA256 cbe31ab1fa330cf6a0e7f48a74ca24cca20c78f7a921109e85cddf99c4ea6965 ChangeLog 2178
+DIST qsa-x11-free-1.1.5.tar.gz 1716783 RMD160 93d28abbcb22a296864a32b8b9904d12eb61140a SHA1 a5cd0a21819a42dc50ae1d81df46743d6e235a4e SHA256 da1f059b4d27f231b9cc78e5cc6d7cd0db572c19e7d4d392597f8f58c6806e9d
+EBUILD qsa-1.0.1.ebuild 905 RMD160 58dc6e3259e0270d5aa3cef94a94266deae93ab5 SHA1 ba582791e48657572a1cce339a90db742213c55d SHA256 d4e0b4d063b365ac0f27e782c15cb941fab2d6d4b1cdc97a2bad481207db822b
+MD5 6b65131ddec484d836f85066769ab378 qsa-1.0.1.ebuild 905
+RMD160 58dc6e3259e0270d5aa3cef94a94266deae93ab5 qsa-1.0.1.ebuild 905
+SHA256 d4e0b4d063b365ac0f27e782c15cb941fab2d6d4b1cdc97a2bad481207db822b qsa-1.0.1.ebuild 905
+EBUILD qsa-1.1.1.ebuild 3171 RMD160 6e1ff580fe59b96cc9012c1c38ea52308f62e685 SHA1 4f4980699d44e43335968650aec0f7771899c5e5 SHA256 87a56ce574f721c7b6ac284469e0b374028d7867b0c282b437fa74b9c0046dce
+MD5 dd289a556daaae21f907d4ee4b616cf6 qsa-1.1.1.ebuild 3171
+RMD160 6e1ff580fe59b96cc9012c1c38ea52308f62e685 qsa-1.1.1.ebuild 3171
+SHA256 87a56ce574f721c7b6ac284469e0b374028d7867b0c282b437fa74b9c0046dce qsa-1.1.1.ebuild 3171
+EBUILD qsa-1.1.5.ebuild 3153 RMD160 b5b2bdfa48b40c391312940ada90149180528e6f SHA1 40ec7043db422b20bd783f86dc9634a272f66291 SHA256 5626bb329c161fe544c8d0e331dab6643cae84b9d82edb7057496337615e467b
+MD5 f3e7cba9582956b883db553878822ffc qsa-1.1.5.ebuild 3153
+RMD160 b5b2bdfa48b40c391312940ada90149180528e6f qsa-1.1.5.ebuild 3153
+SHA256 5626bb329c161fe544c8d0e331dab6643cae84b9d82edb7057496337615e467b qsa-1.1.5.ebuild 3153
+MISC ChangeLog 2363 RMD160 23e7915e7f244ea93896f64892c1207560f0affd SHA1 d550125138f83815086d9ee22177805c8c6847ab SHA256 f07db62b58047be341c35f3c94ea64dc831d46ad67a25c72a9a453db1a6f633b
+MD5 77d6c5b8548404e71901e096e0020273 ChangeLog 2363
+RMD160 23e7915e7f244ea93896f64892c1207560f0affd ChangeLog 2363
+SHA256 f07db62b58047be341c35f3c94ea64dc831d46ad67a25c72a9a453db1a6f633b ChangeLog 2363
 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
 MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e metadata.xml 155
@@ -50,3 +58,13 @@ SHA256 330763c1a0008aad56f458d893d4a7f2ab42c08d3672a8741776a0a7f67808f7 files/di
 MD5 8494c2fd6d26656ea0253e1660246c60 files/digest-qsa-1.1.1 259
 RMD160 3edbd6afccb4c4cac0a101be5a649c7f1d72ca54 files/digest-qsa-1.1.1 259
 SHA256 8623dc1feed538ed53442d77b659976e9b76644c9d51c16ae8eb326ddb4168f0 files/digest-qsa-1.1.1 259
+MD5 8e963b47465d846322d483f3b889d2f6 files/digest-qsa-1.1.5 259
+RMD160 245ed337051e39baab2532d851f66d0cf8988517 files/digest-qsa-1.1.5 259
+SHA256 9b9778f61272029529baa1ca9a4b72de444d86584d94b2aad9ab7598b20b4985 files/digest-qsa-1.1.5 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF+G9NexDpKttj3ykRAvUJAJ9nknVGzOE0kvvwZctc5cX3OiHoxACeII2s
+vJ6T54W/+e9ODpIaQ7Njmbw=
+=C6yZ
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/qsa/files/digest-qsa-1.1.5 b/dev-libs/qsa/files/digest-qsa-1.1.5
new file mode 100644 (file)
index 0000000..b47b4df
--- /dev/null
+++ b/dev-libs/qsa/files/digest-qsa-1.1.5
@@ -0,0 +1,3 @@
+MD5 002470ec15a06b7875328ed57c9be474 qsa-x11-free-1.1.5.tar.gz 1716783
+RMD160 93d28abbcb22a296864a32b8b9904d12eb61140a qsa-x11-free-1.1.5.tar.gz 1716783
+SHA256 da1f059b4d27f231b9cc78e5cc6d7cd0db572c19e7d4d392597f8f58c6806e9d qsa-x11-free-1.1.5.tar.gz 1716783

diff --git a/dev-libs/qsa/qsa-1.0.1.ebuild b/dev-libs/qsa/qsa-1.0.1.ebuild
index 0247b7ac216ced5b7aa0e3c56e4525485d74eec3..093ad9832b712b8acd3331b8e9f18ab925f8e919 100644 (file)
--- a/dev-libs/qsa/qsa-1.0.1.ebuild
+++ b/dev-libs/qsa/qsa-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.0.1.ebuild,v 1.6 2005/07/25 15:40:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.0.1.ebuild,v 1.7 2007/03/14 21:40:21 troll Exp $
 
 inherit eutils qt3
 
@@ -12,13 +12,21 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc amd64"
 SRC_URI="ftp://ftp.trolltech.com/qsa/source/${PN}-x11-free-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
+
 DEPEND="$(qt_min_version 3.2)"
+RDEPEND="${DEPEND}"
 
-src_compile() {
+src_unpack() {
+       unpack ${A}
+
+       cd ${S}
        epatch ${FILESDIR}/${P}-no-examples.diff
        epatch ${FILESDIR}/${P}-sandbox-fix.diff
-       ./configure -prefix ${D}${QTDIR} -no-ide || die
-       emake || die
+}
+
+src_compile() {
+       ./configure -prefix ${D}${QTDIR} -no-ide || die "configure failed"
+       emake || die "make failed"
 }
 
 src_install() {

diff --git a/dev-libs/qsa/qsa-1.1.1.ebuild b/dev-libs/qsa/qsa-1.1.1.ebuild
index f6a3c817ed3d1549e2ec385eb013bee5de1fbd5a..bd69d6d2eef3e60b1245983cd847108799ff87da 100644 (file)
--- a/dev-libs/qsa/qsa-1.1.1.ebuild
+++ b/dev-libs/qsa/qsa-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.8 2006/12/14 23:01:24 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.1.ebuild,v 1.9 2007/03/14 21:40:21 troll Exp $
 
 inherit eutils qt3
 
@@ -14,17 +14,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc examples ide threads"
+
 DEPEND="$(qt_min_version 3.2)"
+RDEPEND="${DEPEND}"
 
-src_compile() {
-       local myconf="-prefix ${D}${QTDIR}"
+src_unpack() {
+       unpack ${A}
 
-       use threads && myconf="${myconf} -thread"
-
-       if ! use ide; then
-               myconf="${myconf} -no-ide"
-               epatch ${FILESDIR}/${P}-without-examples-using-ide.diff
-       fi
+       cd ${S}
+       ! use ide && epatch ${FILESDIR}/${P}-without-examples-using-ide.diff
 
        if use examples; then
                epatch ${FILESDIR}/${P}-with-examples.diff
@@ -34,9 +32,17 @@ src_compile() {
        fi
 
        epatch ${FILESDIR}/${P}-sandbox-fix.diff
+}
+
+src_compile() {
+       local myconf="-prefix ${D}${QTDIR}"
+
+       use threads && myconf="${myconf} -thread"
+       ! use ide && myconf="${myconf} -no-ide"
+
+       ./configure ${myconf} || die "configure failed"
 
-       ./configure ${myconf} || die
-       emake || die
+       emake || die "make failed"
 }
 
 src_install() {

diff --git a/dev-libs/qsa/qsa-1.1.5.ebuild b/dev-libs/qsa/qsa-1.1.5.ebuild
new file mode 100644 (file)
index 0000000..9f487d4
--- /dev/null
+++ b/dev-libs/qsa/qsa-1.1.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.5.ebuild,v 1.1 2007/03/14 21:40:21 troll Exp $
+
+inherit eutils qt3
+
+S="${WORKDIR}/${PN}-x11-free-${PV}"
+
+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/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples ide threads"
+
+DEPEND="$(qt_min_version 3.2)"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+       unpack ${A}
+
+       cd ${S}
+       ! use ide && epatch ${FILESDIR}/${PN}-1.1.1-without-examples-using-ide.diff
+
+       if use examples; then
+               epatch ${FILESDIR}/${PN}-1.1.1-with-examples.diff
+       else
+               epatch ${FILESDIR}/${PN}-1.1.1-without-examples.diff
+       fi
+
+       epatch ${FILESDIR}/${PN}-1.1.1-sandbox-fix.diff
+}
+
+src_compile() {
+       local myconf="-prefix ${D}${QTDIR}"
+
+       use threads && myconf="${myconf} -thread"
+       ! use ide && myconf="${myconf} -no-ide"
+
+       ./configure ${myconf} || die "configure failed"
+
+       emake || die "make failed"
+}
+
+src_install() {
+       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.${PV}
+       cd ${D}/${QTDIR}/lib
+       ln -s libqsa.so.${PV} 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
+
+       #documentation
+       if use doc; then
+               dohtml -A dcf -r doc/html/*
+       fi
+
+       #examples
+       if use examples; then
+               insinto /usr/share/doc/${PF}
+               doins -r examples
+       fi
+
+       dodoc README changes-${PV}
+}
+
+pkg_postinst(){
+       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 && [ "${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
+}