diff options
| -rw-r--r-- | net-im/psi/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/psi/Manifest | 9 | ||||
| -rw-r--r-- | net-im/psi/files/psi-0.12.1-build-error.patch | 23 | ||||
| -rw-r--r-- | net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch | 13 | ||||
| -rw-r--r-- | net-im/psi/psi-0.12.1.ebuild | 92 | ||||
| -rw-r--r-- | net-im/psi/psi-9999.ebuild | 141 |
6 files changed, 80 insertions, 206 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 9cfa716c53b3..b0a30e3acc58 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/psi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.205 2011/05/24 17:46:44 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.206 2011/06/29 05:23:31 pva Exp $ + + 29 Jun 2011; Peter Volkov <pva@gentoo.org> -psi-0.12.1.ebuild, + -files/psi-0.12.1-build-error.patch, + -files/psi-0.12.1-qt-4.5-compatibility.patch, psi-9999.ebuild: + Use git-2 elass, bump EAPI and other cleanups in psi-9999, thank Rion for + report. Drop old. *psi-0.14-r2 (24 May 2011) diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index fd6516fe25bc..17ff40f14cd7 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -1,15 +1,10 @@ -AUX psi-0.12.1-build-error.patch 719 RMD160 401d3d17d9617ead7a78d78431a19c65c21b5667 SHA1 f47f6365c04872ba0a977241ee9d756eee640f0b SHA256 8daaf3e27d153b0c3e97b203adfc081fa06dd0d46a85a219baac9b181d0c51bb -AUX psi-0.12.1-qt-4.5-compatibility.patch 524 RMD160 c68887a6bc31ad20cd42c427769ecd3cfed53280 SHA1 5afbaa1474eec179a6c3ce1f1ea2deafd0a22369 SHA256 5e5c3d8089092c7b81eb6295a701c634ebd223ee6791f36ed56d83d72374ac13 AUX psi-0.14-qt-compat.patch 1492 RMD160 eafdbe9391496bfd2198eaf6aa0637b569331c4a SHA1 5639a2078b1cbe318a4ba7d930fead6101766b59 SHA256 1af6ebbe01094519fcdbbe442a3c5798d499da134a08787648e71783e7b0ba60 -DIST psi-0.12.1.tar.bz2 2112404 RMD160 a5fc850796b0078bc1a03f4ff93a03611ee11e80 SHA1 6fdcea3a072b40333faecc37acdb925f9bf8c5c3 SHA256 a8022faadbbe15bc4691338b1d83400adf069f773b7fa3b462552515990b277e DIST psi-0.14.tar.bz2 2168801 RMD160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f SHA1 f5f8e1a427339a4e9113b5fa513b01a42ae1be4b SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 RMD160 4c3ea59043b91d607a3e30f3cec574e5787a0553 SHA1 6c9ce5717bd3a46a0d1f5eabb3b4756099590435 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb400a54c4a9341 SHA1 969d55207eb89a5000442b57819e98b0a44f37c0 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 -DIST psi-langs-20090217.tar.bz2 641414 RMD160 03e95fc690aa0e1ea49b7ac277ef0ecea91285f8 SHA1 de5e149d6fc55a464af6e614121b8c228b6e1432 SHA256 59f17d6547e4c911e83199fcd3908fa1bf4db312ae25d2c14e27d4c536915f9c -EBUILD psi-0.12.1.ebuild 2540 RMD160 f2172d73dfa757827ae488ca1e29c8a5ef9dd806 SHA1 3b9cfb761279c1edcc2964e5c3229b4206131c42 SHA256 02542f49f8e819b74b5589a11a74bd296c594b7f9d55a9633d97512ad55751ac EBUILD psi-0.14-r1.ebuild 4674 RMD160 9adb8a3f9037b4d1fc1b3191b2cfd3f6ad5d8399 SHA1 37f1d157e8062a218acaf69605e521dbf8efc649 SHA256 b8a329157a633de17275eefb708b3782ed726dabd20f722de53032e8caffbcb9 EBUILD psi-0.14-r2.ebuild 4723 RMD160 b79070de568bf2c86e1c3b2389d92fbba3233fdd SHA1 5846e66e05d08787078df0c8b5f4aaa45f8a9cd1 SHA256 e13f62b4296ace509d9ccf5d8e7edf3155dfc3b17923c929f383cf059ae9751c -EBUILD psi-9999.ebuild 6038 RMD160 b4e08f49708673108305a74180b2eb6cabfe87b4 SHA1 0e41d9955882764aa89aa0c606e5c67f5a3bcd0c SHA256 e08794c873bb70629f3d0a0eb700e3d86384108420609a8774af0cc4b353a520 -MISC ChangeLog 30184 RMD160 817b6de108697b2a85d0b40787740da32733993d SHA1 543cb585ba646cf4643d6a2005189ee8e136baa8 SHA256 3c67fad4d4d96a0e835d0b56ed5d36b9675beb4320d0c743d48a4a78119ca7b1 +EBUILD psi-9999.ebuild 6242 RMD160 d5933a264a8ff9d153c836e6de81ec8fafbf35a6 SHA1 644d440ce69233bef69abcb05697c66f1c01ed8e SHA256 5ea5506885e98be981ed8c524dcada2e0fe5e5287b7852273503a2a1e23a1da6 +MISC ChangeLog 30450 RMD160 1eab321c69f76b20c4f32061aa57339ba2502fad SHA1 e1ab14037b8b7e73171f2554f6e109d792fb2154 SHA256 b78ef39368e3be28b356a25125992273c7391a7ba4638a7f3793982243814502 MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2 diff --git a/net-im/psi/files/psi-0.12.1-build-error.patch b/net-im/psi/files/psi-0.12.1-build-error.patch deleted file mode 100644 index fe7f66336286..000000000000 --- a/net-im/psi/files/psi-0.12.1-build-error.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 360310c8f2dc07c5ff50d4c26b6b984a2c66f5be -Author: Justin Karneges <justin@affinix.com> -Date: Thu Feb 5 22:53:05 2009 -0800 - - make these references less weird - -diff --git a/src/mainwin.cpp b/src/mainwin.cpp -index d12497d..6c130e2 100644 ---- a/src/mainwin.cpp -+++ b/src/mainwin.cpp -@@ -428,9 +428,9 @@ MainWin::~MainWin() - - void MainWin::registerAction( IconAction* action ) - { -- char activated[] = SIGNAL( activated() ); -- char toggled[] = SIGNAL( toggled(bool) ); -- char setChecked[] = SLOT( setChecked(bool) ); -+ const char *activated = SIGNAL( activated() ); -+ const char *toggled = SIGNAL( toggled(bool) ); -+ const char *setChecked = SLOT( setChecked(bool) ); - - struct { - const char* name; diff --git a/net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch b/net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch deleted file mode 100644 index 203ba6e8a6b0..000000000000 --- a/net-im/psi/files/psi-0.12.1-qt-4.5-compatibility.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/main.cpp.old 2009-02-14 21:52:12.000000000 +0500 -+++ src/main.cpp 2009-02-14 21:54:42.000000000 +0500 -@@ -274,9 +274,9 @@ - - int main(int argc, char *argv[]) - { -+ PsiApplication app(argc, argv); - // it must be initialized first in order for ApplicationInfo::resourcesDir() to work - QCA::Initializer init; -- PsiApplication app(argc, argv); - QApplication::addLibraryPath(ApplicationInfo::resourcesDir()); - QApplication::addLibraryPath(ApplicationInfo::homeDir()); - QApplication::setQuitOnLastWindowClosed(false); diff --git a/net-im/psi/psi-0.12.1.ebuild b/net-im/psi/psi-0.12.1.ebuild deleted file mode 100644 index 895354429e17..000000000000 --- a/net-im/psi/psi-0.12.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.12.1.ebuild,v 1.11 2010/01/18 19:01:45 armin76 Exp $ - -EAPI="2" - -inherit eutils qt4 multilib - -LANGPACK_VER="20090217" - -DESCRIPTION="Qt4 Jabber client, with Licq-like interface" -HOMEPAGE="http://psi-im.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://gentoo/${PN}-langs-${LANGPACK_VER}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="crypt dbus debug doc spell ssl xscreensaver" -RESTRICT="test" - -LANGS="cs de eo es_ES fr it mk pl pt_BR ru uk ur_PK vi zh zh_TW" -for LNG in ${LANGS}; do - IUSE="${IUSE} linguas_${LNG}" - #SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm" -done - -COMMON_DEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?] - >=app-crypt/qca-2.0.2: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 )" - -src_prepare() { - epatch "${FILESDIR}/${P}-qt-4.5-compatibility.patch" - epatch "${FILESDIR}/${P}-build-error.patch" -} - -src_configure() { - # 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 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" -} - -src_compile() { - eqmake4 ${PN}.pro - - SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed" - - if use doc; then - cd doc - mkdir -p api # 259632 - 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 || die - newdoc iconsets/system/README README.system || die - newdoc certs/README README.certs || die - dodoc README || die - - if use doc; then - cd doc - dohtml -r api || die "dohtml failed" - fi - - # install translations - cd "${WORKDIR}/${PN}-langs" - insinto /usr/share/${PN}/ - for LNG in ${LANGS}; do - if use linguas_${LNG}; then - doins ${PN}_${LNG/ur_PK/ur_pk}.qm || die - fi - done -} diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 6078b2f12247..75d57ede7518 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.10 2010/11/30 19:24:56 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.11 2011/06/29 05:23:31 pva Exp $ -EAPI="2" +EAPI="4" LANGS="ar be bg br ca cs da de ee el eo es et fi fr hr hu it ja mk nl pl pt pt_BR ru se sk sl sr sr@latin sv sw uk ur_PK vi zh_CN zh_TW" @@ -10,11 +10,10 @@ EGIT_REPO_URI="git://git.psi-im.org/psi.git" EGIT_HAS_SUBMODULES=1 LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n" -ESVN_DISABLE_DEPENDENCIES="true" -ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk/patches" -ESVN_PROJECT="psiplus" +PSI_PLUS_URI="git://github.com/psi-plus/main.git" +PSI_PLUS_ICONSETS_URI="git://github.com/psi-plus/iconsets.git" -inherit eutils qt4-r2 multilib git subversion +inherit eutils qt4-r2 multilib git-2 subversion DESCRIPTION="Qt4 Jabber client, with Licq-like interface" HOMEPAGE="http://psi-im.org/" @@ -22,11 +21,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave -plugins -whiteboarding webkit" +plugins whiteboarding webkit" + +REQUIRED_USE=" + iconsets? ( extras ) + plugins? ( extras ) + powersave? ( extras ) + webkit? ( extras ) +" RDEPEND=" - >=x11-libs/qt-gui-4.4:4[qt3support,dbus?] - >=x11-libs/qt-qt3support-4.4:4 + >=x11-libs/qt-gui-4.4:4[dbus?] >=app-crypt/qca-2.0.2:2 whiteboarding? ( x11-libs/qt-svg:4 ) spell? ( @@ -34,7 +39,7 @@ RDEPEND=" !enchant? ( app-text/aspell ) ) xscreensaver? ( x11-libs/libXScrnSaver ) - extras? ( webkit? ( x11-libs/qt-webkit ) ) + extras? ( webkit? ( x11-libs/qt-webkit:4 ) ) app-arch/unzip " DEPEND="${RDEPEND} @@ -56,12 +61,9 @@ PDEPEND=" RESTRICT="test" pkg_setup() { - for x in iconsets plugins powersave webkit whiteboarding; do - use ${x} && use !extras && \ - ewarn "USE=${x} is only available in Psi+ and requires USE=extras, ${x} will be disabled." - done - + MY_PN=psi if use extras; then + MY_PN=psi-plus echo ewarn "You're about to build heavily patched version of Psi called Psi+." ewarn "It has really nice features but still is under heavy development." @@ -73,6 +75,7 @@ pkg_setup() { ewarn "Note: some patches depend on other. So if you disabled some patch" ewarn "and other started to fail to apply, you'll have to disable patches" ewarn "that fail too." + echo if use iconsets; then echo @@ -84,54 +87,51 @@ pkg_setup() { } src_unpack() { - git_src_unpack + git-2_src_unpack + unset EGIT_HAS_SUBMODULES EGIT_NONBARE # fetch translations mkdir "${WORKDIR}/psi-l10n" for x in ${LANGS}; do if use linguas_${x}; then if use extras && [ "${x}" = "ru" ]; then - EGIT_REPO_URI="git://mva.name/psi-l10n-${x}" - EGIT_PROJECT="psiplus-l10n/${x}" + ESVN_PROJECT="psiplus/psi-l10n/${x}" \ + S="${WORKDIR}" \ + subversion_fetch \ + "http://psi-ru.googlecode.com/svn/branches/psi-plus/" \ + "psi-l10n/${x}" else - EGIT_REPO_URI="${LANGS_URI}-${x}" - EGIT_PROJECT="psi-l10n/${x}" + unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT + EGIT_REPO_URI="${LANGS_URI}-${x}" \ + EGIT_DIR="${EGIT_STORE_DIR}/psi-l10n/${x}" \ + EGIT_SOURCEDIR="${WORKDIR}/psi-l10n/${x}" git-2_src_unpack fi - S="${WORKDIR}/psi-l10n/${x}" git_fetch fi done if use extras; then - S="${WORKDIR}/patches" subversion_fetch + EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/main" \ + EGIT_SOURCEDIR="${WORKDIR}/psi-plus" \ + EGIT_REPO_URI="${PSI_PLUS_URI}" git-2_src_unpack if use iconsets; then - subversion_fetch "${ESVN_REPO_URI%patches}iconsets" "iconsets" - else - for x in activities affiliations clients moods roster system; do - ESVN_PROJECT="psiplus/${x}" \ - subversion_fetch "${ESVN_REPO_URI%patches}iconsets/${x}/default" "iconsets/${x}/default" - done + EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/iconsets" \ + EGIT_SOURCEDIR="${WORKDIR}/iconsets" \ + EGIT_REPO_URI="${PSI_PLUS_ICONSETS_URI}" git-2_src_unpack fi fi } src_prepare() { if use extras; then - EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} - " \ - EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch - - use powersave && epatch "${WORKDIR}/patches/dev/psi-reduce-power-consumption.patch" + cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets" + use iconsets && { cp -a "${WORKDIR}/iconsets" "${S}" || \ + die "failed to copy additional iconsets"; } + EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} " \ + EPATCH_SOURCE="${WORKDIR}/psi-plus/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch - if use whiteboarding; then - sed -e 's/#CONFIG += whiteboarding/CONFIG += whiteboarding/' \ - -i src/src.pro || die "sed failed" - epatch "${WORKDIR}/patches/dev/psi-wb.patch" + use powersave && epatch "${WORKDIR}/psi-plus/patches/dev/psi-reduce-power-consumption.patch" - ewarn "Whiteboarding is very unstable." - fi - - subversion_wc_info - sed -e "s/.xxx/.${ESVN_WC_REVISION}/" \ + sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; git describe --tags | cut -d - -f 2)/" \ -i src/applicationinfo.cpp || die "sed failed" qconf || die "Failed to create ./configure." @@ -144,8 +144,8 @@ src_configure() { # unable to use econf because of non-standard configure script # disable growl as it is a MacOS X extension only local myconf=" - --prefix=/usr - --qtdir=/usr + --prefix="${EPREFIX}"/usr + --qtdir="${EPREFIX}"/usr --disable-bundled-qca --disable-growl --no-separate-debug-info @@ -153,14 +153,11 @@ src_configure() { use dbus || myconf+=" --disable-qdbus" use debug && myconf+=" --debug" if use spell; then - if use enchant; then - myconf+=" --disable-aspell" - else - myconf+=" --disable-enchant" - fi + use enchant && myconf+=" --disable-aspell" || myconf+=" --disable-enchant" else myconf+=" --disable-aspell --disable-enchant" fi + use whiteboarding && myconf+=" --enable-whiteboarding" use xscreensaver || myconf+=" --disable-xss" if use extras; then use plugins && myconf+=" --enable-plugins" @@ -168,13 +165,13 @@ src_configure() { fi einfo "./configure ${myconf}" - ./configure ${myconf} || die "configure failed" + ./configure ${myconf} || die eqmake4 } src_compile() { - emake || die "emake failed" + emake if use doc; then cd doc @@ -184,37 +181,41 @@ src_compile() { } src_install() { - emake INSTALL_ROOT="${D}" install || die "emake install failed" + emake INSTALL_ROOT="${D}" install # this way the docs will be installed in the standard gentoo dir - rm -f "${D}"/usr/share/psi/{COPYING,README} - newdoc iconsets/roster/README README.roster || die - newdoc iconsets/system/README README.system || die - newdoc certs/README README.certs || die - dodoc README || die + rm -f "${ED}"/usr/share/${MY_PN}/{COPYING,README} + newdoc iconsets/roster/README README.roster + newdoc iconsets/system/README README.system + newdoc certs/README README.certs + dodoc README if use extras && use plugins; then - insinto /usr/share/psi/plugins - doins src/plugins/plugins.pri || die - doins src/plugins/psiplugin.pri || die - doins -r src/plugins/include || die - dosed "s:target.path.*:target.path = /usr/$(get_libdir)/psi/plugins:" \ - /usr/share/psi/plugins/psiplugin.pri \ + insinto /usr/share/${MY_PN}/plugins + doins src/plugins/plugins.pri + doins src/plugins/psiplugin.pri + doins -r src/plugins/include + sed -i -e "s:target.path.*:target.path = /usr/$(get_libdir)/${MY_PN}/plugins:" \ + "${ED}"/usr/share/${MY_PN}/plugins/psiplugin.pri \ || die "sed failed" fi - if use doc; then - dohtml -r doc/api || die "dohtml failed" - fi + use doc && dohtml -r doc/api # install translations cd "${WORKDIR}/psi-l10n" - insinto /usr/share/${PN} + insinto /usr/share/${MY_PN} for x in ${LANGS}; do if use linguas_${x}; then lrelease "${x}/${PN}_${x}.ts" || die "lrelease ${x} failed" - doins "${x}/${PN}_${x}.qm" || die - newins "${x}/INFO" "${PN}_${x}.INFO" + doins "${x}/${PN}_${x}.qm" + [ -f "${x}/qt_${x}.qm" ] && doins "${x}/qt_${x}.qm" + [ -f "${x}/qt/qt_${x}.qm" ] && doins "${x}/qt/qt_${x}.qm" + [ -f "${x}/INFO" ] && newins "${x}/INFO" "${PN}_${x}.INFO" fi done } + +pkg_preinst() { + true # suppress subversion warnings +} |