diff options
| -rw-r--r-- | dev-lang/qu-prolog/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/Manifest | 32 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-7.1.ebuild | 10 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild | 29 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-7.2.ebuild | 10 |
5 files changed, 43 insertions, 44 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index 74ecac715d47..7a4a28258f21 100644 --- a/dev-lang/qu-prolog/ChangeLog +++ b/dev-lang/qu-prolog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/qu-prolog # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.8 2006/05/27 08:05:28 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.9 2006/06/25 10:34:25 keri Exp $ + + 25 Jun 2006; Keri Harris <keri@gentoo.org> qu-prolog-7.1.ebuild, + qu-prolog-7.2.ebuild, qu-prolog-7.2-r1.ebuild: + USE flag qt->qt3/qt4 change. Bug #137785. 27 May 2006; Keri Harris <keri@gentoo.org> +files/qu-prolog-7.2-configure.patch, +files/qu-prolog-7.2-qt4.patch, diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest index 0706703b2e58..67a4b6e4b4f8 100644 --- a/dev-lang/qu-prolog/Manifest +++ b/dev-lang/qu-prolog/Manifest @@ -36,22 +36,22 @@ RMD160 68741725964290fd00b77d4647847b1309c062bc files/qu-prolog-7.2-qt4.patch 10 SHA256 0c276d09c0e35b99f6ae9a365baf187ba0f05b7863f4fd6f0472d31e9d43af17 files/qu-prolog-7.2-qt4.patch 10548 DIST qp7.1.tar.gz 1275135 RMD160 7fe112ea31f9d7675dcffd67219a4fad7a2bf82a SHA1 974b58ea446a4a5aeaf39dac722a39f6ab74f1e2 SHA256 9fee14ca3284f466c502437f4050f3def1390304644a020c1fe12bf809c523cb DIST qp7.2.tar.gz 1278184 RMD160 aa4c902b2804d727b1886e9d3da405e0fffbe819 SHA1 3578ecb2ab98cd2ad8a1c1921cb430e2058f6678 SHA256 49fdd81fb6aa31c29038671a347cfae9de0371ba8663e2d978cb7c8d1fc21aa9 -EBUILD qu-prolog-7.1.ebuild 1741 RMD160 d624ee85f1ead566cdc595f57f6ef322edd6c7f5 SHA1 24cc05f791d1d0ef3fb2da65e9c31fc3b73a0f29 SHA256 487b4a63601e255b896dc2a54c14efde286a8654d230dd9f01e9b6ee80f5ed7d -MD5 9d1e33639ecb9cc5811e583a72afcd5f qu-prolog-7.1.ebuild 1741 -RMD160 d624ee85f1ead566cdc595f57f6ef322edd6c7f5 qu-prolog-7.1.ebuild 1741 -SHA256 487b4a63601e255b896dc2a54c14efde286a8654d230dd9f01e9b6ee80f5ed7d qu-prolog-7.1.ebuild 1741 -EBUILD qu-prolog-7.2-r1.ebuild 2085 RMD160 26cfb1e0499b25b35ab269dfb468f5a389e755a0 SHA1 d04354f1abe187d3e2778e66c70617cffe1ee97b SHA256 74b254af2eddd2396ddb73bd9a4826fc1094abf8a5a314989c17fe44c5575952 -MD5 430678067037eeee1d8bc9ded2732a91 qu-prolog-7.2-r1.ebuild 2085 -RMD160 26cfb1e0499b25b35ab269dfb468f5a389e755a0 qu-prolog-7.2-r1.ebuild 2085 -SHA256 74b254af2eddd2396ddb73bd9a4826fc1094abf8a5a314989c17fe44c5575952 qu-prolog-7.2-r1.ebuild 2085 -EBUILD qu-prolog-7.2.ebuild 1741 RMD160 c124eb42a6b3fd59bdc837f4bd6247815a320b29 SHA1 977c43db7698965886fbda7f37df9cf2bba56421 SHA256 3d6104125093316e9b75392adc6dfa92906f161908a9df607eefc51d5975ea65 -MD5 c04bbe70e85447bb575c14eba256d397 qu-prolog-7.2.ebuild 1741 -RMD160 c124eb42a6b3fd59bdc837f4bd6247815a320b29 qu-prolog-7.2.ebuild 1741 -SHA256 3d6104125093316e9b75392adc6dfa92906f161908a9df607eefc51d5975ea65 qu-prolog-7.2.ebuild 1741 -MISC ChangeLog 1426 RMD160 9ca1acb0422c4db4714ebd5bd8de17115e69560d SHA1 7ae2a01660feba11bd3152015c2abab99daec4f1 SHA256 5fcd8e649dfaf8d35efac6afe20748597c71d9776fd2630c3ed768f9ff75078c -MD5 0178de95573efccd56bcb050ded01407 ChangeLog 1426 -RMD160 9ca1acb0422c4db4714ebd5bd8de17115e69560d ChangeLog 1426 -SHA256 5fcd8e649dfaf8d35efac6afe20748597c71d9776fd2630c3ed768f9ff75078c ChangeLog 1426 +EBUILD qu-prolog-7.1.ebuild 1745 RMD160 bb605a8ba2517b46c2ee094d4b254685a04ccf23 SHA1 94bc8c0b19841306f57d1532ad4ac1575b161069 SHA256 f8ee194b27b848341e981c81227db66781bd78c1d74979a5f043a828f9d4d752 +MD5 f868fbec2f43fcfe6aa150b849b17a3c qu-prolog-7.1.ebuild 1745 +RMD160 bb605a8ba2517b46c2ee094d4b254685a04ccf23 qu-prolog-7.1.ebuild 1745 +SHA256 f8ee194b27b848341e981c81227db66781bd78c1d74979a5f043a828f9d4d752 qu-prolog-7.1.ebuild 1745 +EBUILD qu-prolog-7.2-r1.ebuild 1975 RMD160 33f106b925f807f22967cb238a713f000eee2aa6 SHA1 1d83789028cdff11670e97baf568c08d7cc599a4 SHA256 b6c2baa44d567b7a1cea85d3c54caab122b57d309e67489aba5bed11b245bb10 +MD5 4d5d57b32b8ab22b0088bade80b51061 qu-prolog-7.2-r1.ebuild 1975 +RMD160 33f106b925f807f22967cb238a713f000eee2aa6 qu-prolog-7.2-r1.ebuild 1975 +SHA256 b6c2baa44d567b7a1cea85d3c54caab122b57d309e67489aba5bed11b245bb10 qu-prolog-7.2-r1.ebuild 1975 +EBUILD qu-prolog-7.2.ebuild 1745 RMD160 6ebf4318d70f0e0b9df829903846754727709332 SHA1 2cbfc64b4d76a975f0c0c2438a450b6438eb3d1c SHA256 9bfcd2d7baa88108cba273fa50e9a8a34eda5636221aff547c458aa485420133 +MD5 e35a726fb7f1bbb9557e03bb7445de8a qu-prolog-7.2.ebuild 1745 +RMD160 6ebf4318d70f0e0b9df829903846754727709332 qu-prolog-7.2.ebuild 1745 +SHA256 9bfcd2d7baa88108cba273fa50e9a8a34eda5636221aff547c458aa485420133 qu-prolog-7.2.ebuild 1745 +MISC ChangeLog 1587 RMD160 ecb74e8d9fab4b4794e32abecaa413136b354a8f SHA1 bec311aa6fcc7605dae9bf546cd4228095e8bf75 SHA256 3157de947d5e4717f57516a37d96828d83148b56ab2ecddb163a4bc994524cdc +MD5 02f2c778d497effff96a8608240f2700 ChangeLog 1587 +RMD160 ecb74e8d9fab4b4794e32abecaa413136b354a8f ChangeLog 1587 +SHA256 3157de947d5e4717f57516a37d96828d83148b56ab2ecddb163a4bc994524cdc ChangeLog 1587 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 diff --git a/dev-lang/qu-prolog/qu-prolog-7.1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.1.ebuild index 1e06ba31462f..20875516b4d8 100644 --- a/dev-lang/qu-prolog/qu-prolog-7.1.ebuild +++ b/dev-lang/qu-prolog/qu-prolog-7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.1.ebuild,v 1.5 2006/05/26 09:49:36 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.1.ebuild,v 1.6 2006/06/25 10:34:25 keri Exp $ inherit eutils flag-o-matic @@ -13,9 +13,9 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="~ppc ~x86" -IUSE="doc qt threads" +IUSE="doc qt3 threads" -DEPEND="qt? ( =x11-libs/qt-3* )" +DEPEND="qt3? ( =x11-libs/qt-3* )" S="${WORKDIR}/${MY_P}" @@ -37,7 +37,7 @@ src_compile() { || die "econf failed" emake || die "emake failed" - if use qt ; then + if use qt3 ; then cd "${S}"/src/xqp "${QTDIR}"/bin/qmake || die "qmake xqp failed" emake || die "emake xqp failed" @@ -49,7 +49,7 @@ src_install() { doexe src/qa src/qdeal src/qem src/ql doexe bin/qc bin/qecat bin/qp bin/qppp - use qt && doexe src/xqp/xqp + use qt3 && doexe src/xqp/xqp insinto /usr/lib/${PN}/bin doins prolog/qc1/qc1.qx \ diff --git a/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild index 18b91e5d9c6e..1ca4b01700c6 100644 --- a/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild +++ b/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild,v 1.2 2006/05/27 08:05:28 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild,v 1.3 2006/06/25 10:34:25 keri Exp $ inherit autotools eutils versionator @@ -13,19 +13,13 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="~ppc ~x86" -IUSE="debug doc qt threads" +IUSE="debug doc qt3 qt4 threads" -DEPEND="qt? ( x11-libs/qt )" +DEPEND="qt3? ( =x11-libs/qt-3* ) + qt4? ( >=x11-libs/qt-4* )" S="${WORKDIR}"/${MY_P} -get_qt_ver() { - qt_ver="$(best_version x11-libs/qt)" - qt_ver=${qt_ver//*qt-} - qt_ver=${qt_ver//-*} - qt_ver=$(get_major_version ${qt_ver}) -} - src_unpack() { unpack ${A} cd "${S}" @@ -34,8 +28,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc4.patch epatch "${FILESDIR}"/${P}-debug.patch - get_qt_ver - [[ ${qt_ver} -eq 4 ]] && epatch "${FILESDIR}"/${P}-qt4.patch + use qt4 && epatch "${FILESDIR}"/${P}-qt4.patch } src_compile() { @@ -48,12 +41,12 @@ src_compile() { || die "econf failed" emake || die "emake failed" - if use qt ; then + if use qt3 || use qt4; then cd "${S}"/src/xqp - if [ ${qt_ver} -eq 4 ] ; then \ - qmake || die "qmake xqp failed" - else + if use qt3; then "${QTDIR}"/bin/qmake || die "qmake xqp failed" + else + qmake || die "qmake xqp failed" fi emake || die "emake xqp failed" fi @@ -64,7 +57,9 @@ src_install() { doexe src/qa src/qdeal src/qem src/ql doexe bin/qc bin/qecat bin/qp bin/qppp - use qt && doexe src/xqp/xqp + if use qt3 || use qt4; then + doexe src/xqp/xqp + fi insinto /usr/lib/${PN}/bin doins prolog/qc1/qc1.qx \ diff --git a/dev-lang/qu-prolog/qu-prolog-7.2.ebuild b/dev-lang/qu-prolog/qu-prolog-7.2.ebuild index accb8a540f16..c664a701e26e 100644 --- a/dev-lang/qu-prolog/qu-prolog-7.2.ebuild +++ b/dev-lang/qu-prolog/qu-prolog-7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2.ebuild,v 1.2 2006/05/26 09:49:36 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2.ebuild,v 1.3 2006/06/25 10:34:25 keri Exp $ inherit eutils flag-o-matic @@ -13,9 +13,9 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" LICENSE="as-is" SLOT="0" KEYWORDS="~ppc ~x86" -IUSE="doc qt threads" +IUSE="doc qt3 threads" -DEPEND="qt? ( =x11-libs/qt-3* )" +DEPEND="qt3? ( =x11-libs/qt-3* )" S="${WORKDIR}/${MY_P}" @@ -37,7 +37,7 @@ src_compile() { || die "econf failed" emake || die "emake failed" - if use qt ; then + if use qt3 ; then cd "${S}"/src/xqp "${QTDIR}"/bin/qmake || die "qmake xqp failed" emake || die "emake xqp failed" @@ -49,7 +49,7 @@ src_install() { doexe src/qa src/qdeal src/qem src/ql doexe bin/qc bin/qecat bin/qp bin/qppp - use qt && doexe src/xqp/xqp + use qt3 && doexe src/xqp/xqp insinto /usr/lib/${PN}/bin doins prolog/qc1/qc1.qx \ |