From b017059ca6bd23e6194a3293eae364ef9ba6785e Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 3 Aug 2008 15:40:20 +0200 Subject: [PATCH] Stop using qt4_min_version() as it's deprecated. Removed obsolete RCs of net-im/psi. --- net-im/psi/Manifest | 8 ++--- net-im/psi/psi-0.12_rc1.ebuild | 72 ------------------------------------------ net-im/psi/psi-0.12_rc2.ebuild | 72 ------------------------------------------ net-im/psi/psi-9999.ebuild | 9 +++--- 4 files changed, 7 insertions(+), 154 deletions(-) rewrite net-im/psi/Manifest (84%) delete mode 100644 net-im/psi/psi-0.12_rc1.ebuild delete mode 100644 net-im/psi/psi-0.12_rc2.ebuild diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest dissimilarity index 84% index 15e2138..5f58953 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -1,6 +1,2 @@ -DIST psi-0.12-RC1.tar.bz2 2043825 RMD160 c3341809da5797f397b84ef3acdbeb7c61a4c445 SHA1 a348564e9932636a41ba408ae0d61d360f543c4e SHA256 47cc6dc4ae6a7db259dbbe9b84d6e40cd05f305b2f671e1e09edf7be6db5a429 -DIST psi-0.12-RC2.tar.bz2 2053269 RMD160 9aa72fa60a46ac902bd934ff61b895903b6394a2 SHA1 867ae0f11e8684216df9146f5b9452c7a9bb904f SHA256 2a428a977c0d571399913e7bf6bf744490b821539dabe62d6882870d553d73f9 -EBUILD psi-0.12_rc1.ebuild 1918 RMD160 bad1181ee9eaab2ab2e8c7fc99c53ad812936d44 SHA1 ce1bf52bcd9642d8fcf369d09502d370663bc16b SHA256 d7dea084fabc1748bed2c1ff80fdfe4cdd779a180dcb66c7bcde7fb9a5026784 -EBUILD psi-0.12_rc2.ebuild 1918 RMD160 bad1181ee9eaab2ab2e8c7fc99c53ad812936d44 SHA1 ce1bf52bcd9642d8fcf369d09502d370663bc16b SHA256 d7dea084fabc1748bed2c1ff80fdfe4cdd779a180dcb66c7bcde7fb9a5026784 -EBUILD psi-9999.ebuild 1896 RMD160 12c14cd613ca198878443fba17f11092c170fba9 SHA1 18ad150242234555a7ff895983d253f48d3ca578 SHA256 6f12102529bb2e904065c4fecbe9e1f9821014716a8e4ef053b2f064d953fe44 -MISC metadata.xml 302 RMD160 65fcfc7ae49e9294d40f9c135862fa20976773cf SHA1 bdc435738f861b5596ad3b50265a3ec03f7d6692 SHA256 bf31cfa66dba7121f79935186c524971782518b285e16f396fbe9aa6d592ceb6 +EBUILD psi-9999.ebuild 1919 RMD160 301e390745d1cc1e4e4f7d27981bdca95c132cea SHA1 5d45518e7261e6ddff482e248ba0021d9ac6ad2d SHA256 79b505aa98153d36b2675fa7251af354610235d4113de014a8fadcbe7f2e8f2b +MISC metadata.xml 302 RMD160 65fcfc7ae49e9294d40f9c135862fa20976773cf SHA1 bdc435738f861b5596ad3b50265a3ec03f7d6692 SHA256 bf31cfa66dba7121f79935186c524971782518b285e16f396fbe9aa6d592ceb6 diff --git a/net-im/psi/psi-0.12_rc1.ebuild b/net-im/psi/psi-0.12_rc1.ebuild deleted file mode 100644 index 55032b1..0000000 --- a/net-im/psi/psi-0.12_rc1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils qt4 multilib - -MY_P=${P/_rc/-RC} - -DESCRIPTION="Qt4 Jabber client, with Licq-like interface" -HOMEPAGE="http://psi-im.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" -RESTRICT="mirror" - -IUSE="crypt dbus debug doc kernel_linux spell ssl xscreensaver" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -COMMON_DEPEND="$(qt4_min_version 4.2.0) - =app-crypt/qca-2* - spell? ( app-text/aspell ) - xscreensaver? ( x11-libs/libXScrnSaver )" - -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen )" - -RDEPEND="${COMMON_DEPEND} - crypt? ( >=app-crypt/qca-gnupg-2.0.0_beta2 ) - ssl? ( >=app-crypt/qca-ossl-2.0.0_beta2 )" - -S="${WORKDIR}/${MY_P}" - -QT4_BUILT_WITH_USE_CHECK="qt3support png" -QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus" - -src_compile() { - # disable growl as it is a MacOS X extension only - local myconf="--prefix=/usr --qtdir=/usr" - myconf="${myconf} --disable-growl --disable-bundled-qca" - use debug && myconf="${myconf} --enable-debug" - use dbus || myconf="${myconf} --disable-qdbus" - use kernel_linux || myconf="${myconf} --disable-dnotify" - use spell || myconf="${myconf} --disable-aspell" - use xscreensaver || myconf="${myconf} --disable-xss" - - # cannot use econf because of non-standard configure script - ./configure ${myconf} || die "configure failed" - - eqmake4 ${PN}.pro - - SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed" - - if use doc; then - cd doc - make api_public || die "make api_public failed" - fi -} - -src_install() { - emake INSTALL_ROOT="${D}" install || die "emake install failed" - - # this way the docs will be installed in the standard gentoo dir - newdoc iconsets/roster/README README.roster - newdoc iconsets/system/README README.system - newdoc certs/README README.certs - dodoc README - - if use doc; then - cd doc - dohtml -r api || die "dohtml failed" - fi -} diff --git a/net-im/psi/psi-0.12_rc2.ebuild b/net-im/psi/psi-0.12_rc2.ebuild deleted file mode 100644 index 55032b1..0000000 --- a/net-im/psi/psi-0.12_rc2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils qt4 multilib - -MY_P=${P/_rc/-RC} - -DESCRIPTION="Qt4 Jabber client, with Licq-like interface" -HOMEPAGE="http://psi-im.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" -RESTRICT="mirror" - -IUSE="crypt dbus debug doc kernel_linux spell ssl xscreensaver" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -COMMON_DEPEND="$(qt4_min_version 4.2.0) - =app-crypt/qca-2* - spell? ( app-text/aspell ) - xscreensaver? ( x11-libs/libXScrnSaver )" - -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen )" - -RDEPEND="${COMMON_DEPEND} - crypt? ( >=app-crypt/qca-gnupg-2.0.0_beta2 ) - ssl? ( >=app-crypt/qca-ossl-2.0.0_beta2 )" - -S="${WORKDIR}/${MY_P}" - -QT4_BUILT_WITH_USE_CHECK="qt3support png" -QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus" - -src_compile() { - # disable growl as it is a MacOS X extension only - local myconf="--prefix=/usr --qtdir=/usr" - myconf="${myconf} --disable-growl --disable-bundled-qca" - use debug && myconf="${myconf} --enable-debug" - use dbus || myconf="${myconf} --disable-qdbus" - use kernel_linux || myconf="${myconf} --disable-dnotify" - use spell || myconf="${myconf} --disable-aspell" - use xscreensaver || myconf="${myconf} --disable-xss" - - # cannot use econf because of non-standard configure script - ./configure ${myconf} || die "configure failed" - - eqmake4 ${PN}.pro - - SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed" - - if use doc; then - cd doc - make api_public || die "make api_public failed" - fi -} - -src_install() { - emake INSTALL_ROOT="${D}" install || die "emake install failed" - - # this way the docs will be installed in the standard gentoo dir - newdoc iconsets/roster/README README.roster - newdoc iconsets/system/README README.system - newdoc certs/README README.certs - dodoc README - - if use doc; then - cd doc - dohtml -r api || die "dohtml failed" - fi -} diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 6eae21e..c151169 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -2,12 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="1" + inherit eutils qt4 multilib subversion ESVN_REPO_URI="http://svn.psi-im.org/psi/trunk" -#MY_P=${P/_rc/-RC} - DESCRIPTION="Qt4 Jabber client, with Licq-like interface" HOMEPAGE="http://psi-im.org/" LICENSE="GPL-2" @@ -15,8 +15,9 @@ LICENSE="GPL-2" IUSE="crypt dbus debug doc kernel_linux spell ssl xscreensaver" SLOT="0" KEYWORDS="" +RESTRICT="test" -COMMON_DEPEND="$(qt4_min_version 4.2.0) +COMMON_DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) =app-crypt/qca-2* spell? ( app-text/aspell ) xscreensaver? ( x11-libs/libXScrnSaver )" @@ -31,7 +32,7 @@ RDEPEND="${COMMON_DEPEND} S="${WORKDIR}/${PN}" QT4_BUILT_WITH_USE_CHECK="qt3support png" -#QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus" +QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus" src_compile() { # disable growl as it is a MacOS X extension only -- 2.11.4.GIT