Mercurial > hg > portage
changeset 437:061dcecdcd1e
resolved merge conflict
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 20 Mar 2017 07:20:37 +0100 |
parents | 3360705cfae7 (diff) bf2801b18664 (current diff) |
children | c999bcda270f |
files | net-im/psi-plus/Manifest |
diffstat | 5 files changed, 280 insertions(+), 280 deletions(-) [+] |
line wrap: on
line diff
--- a/net-im/psi-plus/Manifest Mon Dec 26 17:45:32 2016 +0100 +++ b/net-im/psi-plus/Manifest Mon Mar 20 07:20:37 2017 +0100 @@ -1,5 +1,5 @@ AUX qmake.patch 2010 SHA256 39824af9a7c91764f0503a61ce6b5796ae5ab8b8d9ca7fa07460ade48860dc69 SHA512 8f8aaef67c10d0c7ca1fd7c2c3123258b5b5785b7dc5eb2a2c7d8667048ec209cf61c26eb5f51c5547a7204b976103bf992c345814576191b26f7766e5162b98 WHIRLPOOL b0cf1b7596d08df27be2c9365aca67e5b1aa7b95d49051066bb814c5770c382f9b982cac7dd102eb1be325b500301dd15d818883c21ac0514c3da2f880820cdc -DIST psi-plus-0.16.564.585.tar.gz 8343677 SHA256 7fe8fb686984c2fd3fabe4568e6fbdf0550af5a2733da4741069e12f5a7abb73 SHA512 2163ee0be10a1210c6f368a5662b5c9afc482b0cefa0ff36dd6b56424f65e33d83c8ad72b4ba57eccb9a37559226be64bee88e9c9a352b1233dffdf00f851839 WHIRLPOOL 7e3067bbcd19bc8b51bd8b196e9628a436cdd4b7b04fb13f64c65dd9e3dc852042947a6052860e2c4bcb63b3ff4ef746d8dedc42b29234da8c887bbd87d349ef -DIST psi-plus-0.16.568.604.tar.gz 8377618 SHA256 c59cdabfa5f788d4b1fb92cb46a851d0f95420dc0edec9d9adc8c1584f1e91b2 SHA512 6727fef591008794d740833e415a50b99cf3677365da1baeb68e2ea926797444c9f06060918e7f7a0e8012db66ae3a3124c0f0f5bd489807cc003a32effb5d2e WHIRLPOOL a27350ae15fc30b17fe332bff8aba80bd7417136f56fc6e5be618bfc9fb9944e3a94264e74ffc044b81ff21b701caaa806c04a430f94b04aaaaa24eb04cfcbb0 -EBUILD psi-plus-0.16.564.585.ebuild 3048 SHA256 6b330fbd4d91c2a5547e014e3761027d8c14667b308e33de9e0c5028c4d53e1f SHA512 41b927c7180675685235134e5ff1b73a8196d0f777f8cf948545b67c387730ac5245d76d59c7572116540d6149c3cd5c677186e2570a064af971536bd57da790 WHIRLPOOL d7390b90688a90480514b97e80dc59db7beaef7f2e873fed2f89699b5af82165f4284e4547d8da85e76b1eae9e167831799ca4a599527f5015f43d166f5ccae0 -EBUILD psi-plus-0.16.568.604.ebuild 3039 SHA256 4ae0740ee564c77e79dd7f3d906ad66bd9466839f28279c355809171bd3c010a SHA512 7fccfaca97ed90bf1129b19ad4836431386d44f14e29074127e25c68dbf40343b4c8641e9d08c4e40f2dc3dc85a1fd4a397a541a0a3447a0a6d49aedb2e9bca2 WHIRLPOOL 0f47197544e4dd0e85f3c91446fe8e82f012bc884f73eb626382fdee7264b8d419c1862c5b715ea40135a23d99a090e40f6ac3856cc336e55f592f48077915f3 +DIST psi-plus-0.16.568.608.tar.gz 8378282 SHA256 032c6624441424bf50662d93c769caa69325e8363130e95878d29e2d8914fdfd SHA512 762dbdaef26d6ca858fc42a27212dd916a9dbb3d29026230b36813468b42c98765fef31a8cddb743ec3cf6908e9c92a66914293637a74d65b292d15a21f10882 WHIRLPOOL 52bfb8671d8e28e77c7f7946674840a998fd31bd75f8db9baec1af4424183f73d84a745132c6a8aa8d7bee68a627cd02dc5b85f3be9c5465ec3be7789ae6e68b +DIST psi-plus-0.16.571.627.tar.gz 8364135 SHA256 1f537788d5c7af3db999b706790791716687693f0d41b66a1de75516da4c1047 SHA512 274640aac86c1b9bc43baaa8739bf9ba98f09a3f5dd083678cd74b959431250e0a07cfe7cc0fc11b38fb34d2e4bd4527bc6e534856695f991dd090516d3f7eb5 WHIRLPOOL f990909b3ac4637262b9f53cbff64172710f9af17e078b2b54b27eeed81bebf7cc37eb9cfa7bbfa0644920f6d929c62d0e83a8ca77617e0675d13cefd5fda0e8 +EBUILD psi-plus-0.16.568.608.ebuild 3039 SHA256 4ae0740ee564c77e79dd7f3d906ad66bd9466839f28279c355809171bd3c010a SHA512 7fccfaca97ed90bf1129b19ad4836431386d44f14e29074127e25c68dbf40343b4c8641e9d08c4e40f2dc3dc85a1fd4a397a541a0a3447a0a6d49aedb2e9bca2 WHIRLPOOL 0f47197544e4dd0e85f3c91446fe8e82f012bc884f73eb626382fdee7264b8d419c1862c5b715ea40135a23d99a090e40f6ac3856cc336e55f592f48077915f3 +EBUILD psi-plus-0.16.571.627.ebuild 3039 SHA256 4ae0740ee564c77e79dd7f3d906ad66bd9466839f28279c355809171bd3c010a SHA512 7fccfaca97ed90bf1129b19ad4836431386d44f14e29074127e25c68dbf40343b4c8641e9d08c4e40f2dc3dc85a1fd4a397a541a0a3447a0a6d49aedb2e9bca2 WHIRLPOOL 0f47197544e4dd0e85f3c91446fe8e82f012bc884f73eb626382fdee7264b8d419c1862c5b715ea40135a23d99a090e40f6ac3856cc336e55f592f48077915f3
--- a/net-im/psi-plus/psi-plus-0.16.564.585.ebuild Mon Dec 26 17:45:32 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ - -EAPI=5 - -inherit eutils l10n multilib gnome2-utils qt4-r2 - -DESCRIPTION="Qt4 Jabber client, with Licq-like interface" -HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/" -SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/psi-plus-snapshots-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin plugins spell ssl xscreensaver watcherplugin whiteboarding" -#RESTRICT="test" - -RDEPEND="app-arch/unzip - >=dev-qt/qtgui-4.7:4 - >=app-crypt/qca-2.0.2:2[qt4(+)] - x11-libs/libX11 - dbus? ( >=dev-qt/qtdbus-4.7:4 ) - spell? ( >=app-text/enchant-1.3.0 ) - xscreensaver? ( x11-libs/libXScrnSaver ) - whiteboarding? ( dev-qt/qtsvg:4 ) - || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )" - -DEPEND="${RDEPEND} - sys-devel/qconf - doc? ( app-doc/doxygen )" - -PDEPEND="crypt? ( app-crypt/qca:2[gpg] ) - jingle? ( net-im/psimedia - app-crypt/qca:2[openssl] ) - ssl? ( app-crypt/qca:2[openssl] ) - otrplugin? ( net-libs/libotr app-text/htmltidy )" - -src_prepare() { - epatch_user -} - -src_configure() { - # unable to use econf because of non-standard configure script - local confcmd="./configure - --prefix=/usr - --datadir=/usr/share - --libdir=/usr/lib64 - --disable-growl - --with-qca-inc=/usr/include/QtCrypto - --with-qca-lib=/usr/lib64 - $(use dbus || echo '--disable-qdbus') - $(use debug && echo '--debug') - $(use plugins && echo '--enable-plugins') - $(use spell || echo '--disable-aspell') - $(use spell || echo '--disable-enchant') - $(use xscreensaver || echo '--disable-xss') - $(use whiteboarding && echo '--enable-whiteboarding')" - - echo ${confcmd} - ${confcmd} || die "configure failed" - ## Makefile is not always created... - #[[ ! -f Makefile ]] && die "configure failed" -} - -src_compile() { - emake || die "emake failed" - - if use autoreplyplugin; then - cd src/plugins/generic/autoreplyplugin - qmake - make - cd ../../../.. - fi - - if use otrplugin; then - cd src/plugins/generic/otrplugin - qmake - make - cd ../../../.. - fi - - if use watcherplugin; then - cd src/plugins/generic/watcherplugin - qmake - make - cd ../../../.. - fi -} - -src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - dodoc README TODO ChangeLog - - if use autoreplyplugin; then - cd src/plugins/generic/autoreplyplugin - - local plugindir="/usr/$(get_libdir)/psi-plus/plugins" - dodir "${plugindir}" - insinto "${plugindir}" - doins libautoreplyplugin.so - - cd ../../../.. - fi - - if use otrplugin; then - cd src/plugins/generic/otrplugin - - local plugindir="/usr/$(get_libdir)/psi-plus/plugins" - dodir "${plugindir}" - insinto "${plugindir}" - doins libotrplugin.so - - cd ../../../.. - fi - - if use watcherplugin; then - cd src/plugins/generic/watcherplugin - - local plugindir="/usr/$(get_libdir)/psi-plus/plugins" - dodir "${plugindir}" - insinto "${plugindir}" - doins libwatcherplugin.so - - cd ../../../.. - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}
--- a/net-im/psi-plus/psi-plus-0.16.568.604.ebuild Mon Dec 26 17:45:32 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ - -EAPI=5 - -inherit eutils l10n multilib gnome2-utils qt4-r2 - -DESCRIPTION="Qt4 Jabber client, with Licq-like interface" -HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/" -SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/psi-plus-snapshots-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin plugins spell ssl xscreensaver watcherplugin whiteboarding" -#RESTRICT="test" - -RDEPEND="app-arch/unzip - >=dev-qt/qtgui-4.7:4 - >=app-crypt/qca-2.0.2:2[qt4(+)] - x11-libs/libX11 - dbus? ( >=dev-qt/qtdbus-4.7:4 ) - spell? ( >=app-text/enchant-1.3.0 ) - xscreensaver? ( x11-libs/libXScrnSaver ) - whiteboarding? ( dev-qt/qtsvg:4 ) - || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )" - -DEPEND="${RDEPEND} - sys-devel/qconf - doc? ( app-doc/doxygen )" - -PDEPEND="crypt? ( app-crypt/qca:2[gpg] ) - jingle? ( net-im/psimedia - app-crypt/qca:2[ssl] ) - ssl? ( app-crypt/qca:2[ssl] ) - otrplugin? ( net-libs/libotr app-text/htmltidy )" - -src_prepare() { - epatch_user -} - -src_configure() { - # unable to use econf because of non-standard configure script - local confcmd="./configure - --prefix=/usr - --datadir=/usr/share - --libdir=/usr/lib64 - --disable-growl - --with-qca-inc=/usr/include/QtCrypto - --with-qca-lib=/usr/lib64 - $(use dbus || echo '--disable-qdbus') - $(use debug && echo '--debug') - $(use plugins && echo '--enable-plugins') - $(use spell || echo '--disable-aspell') - $(use spell || echo '--disable-enchant') - $(use xscreensaver || echo '--disable-xss') - $(use whiteboarding && echo '--enable-whiteboarding')" - - echo ${confcmd} - ${confcmd} || die "configure failed" - ## Makefile is not always created... - #[[ ! -f Makefile ]] && die "configure failed" -} - -src_compile() { - emake || die "emake failed" - - if use autoreplyplugin; then - cd src/plugins/generic/autoreplyplugin - qmake - make - cd ../../../.. - fi - - if use otrplugin; then - cd src/plugins/generic/otrplugin - qmake - make - cd ../../../.. - fi - - if use watcherplugin; then - cd src/plugins/generic/watcherplugin - qmake - make - cd ../../../.. - fi -} - -src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - dodoc README TODO ChangeLog - - if use autoreplyplugin; then - cd src/plugins/generic/autoreplyplugin - - local plugindir="/usr/$(get_libdir)/psi-plus/plugins" - dodir "${plugindir}" - insinto "${plugindir}" - doins libautoreplyplugin.so - - cd ../../../.. - fi - - if use otrplugin; then - cd src/plugins/generic/otrplugin - - local plugindir="/usr/$(get_libdir)/psi-plus/plugins" - dodir "${plugindir}" - insinto "${plugindir}" - doins libotrplugin.so - - cd ../../../.. - fi - - if use watcherplugin; then - cd src/plugins/generic/watcherplugin - - local plugindir="/usr/$(get_libdir)/psi-plus/plugins" - dodir "${plugindir}" - insinto "${plugindir}" - doins libwatcherplugin.so - - cd ../../../.. - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-im/psi-plus/psi-plus-0.16.568.608.ebuild Mon Mar 20 07:20:37 2017 +0100 @@ -0,0 +1,138 @@ + +EAPI=5 + +inherit eutils l10n multilib gnome2-utils qt4-r2 + +DESCRIPTION="Qt4 Jabber client, with Licq-like interface" +HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/" +SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/psi-plus-snapshots-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin plugins spell ssl xscreensaver watcherplugin whiteboarding" +#RESTRICT="test" + +RDEPEND="app-arch/unzip + >=dev-qt/qtgui-4.7:4 + >=app-crypt/qca-2.0.2:2[qt4(+)] + x11-libs/libX11 + dbus? ( >=dev-qt/qtdbus-4.7:4 ) + spell? ( >=app-text/enchant-1.3.0 ) + xscreensaver? ( x11-libs/libXScrnSaver ) + whiteboarding? ( dev-qt/qtsvg:4 ) + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )" + +DEPEND="${RDEPEND} + sys-devel/qconf + doc? ( app-doc/doxygen )" + +PDEPEND="crypt? ( app-crypt/qca:2[gpg] ) + jingle? ( net-im/psimedia + app-crypt/qca:2[ssl] ) + ssl? ( app-crypt/qca:2[ssl] ) + otrplugin? ( net-libs/libotr app-text/htmltidy )" + +src_prepare() { + epatch_user +} + +src_configure() { + # unable to use econf because of non-standard configure script + local confcmd="./configure + --prefix=/usr + --datadir=/usr/share + --libdir=/usr/lib64 + --disable-growl + --with-qca-inc=/usr/include/QtCrypto + --with-qca-lib=/usr/lib64 + $(use dbus || echo '--disable-qdbus') + $(use debug && echo '--debug') + $(use plugins && echo '--enable-plugins') + $(use spell || echo '--disable-aspell') + $(use spell || echo '--disable-enchant') + $(use xscreensaver || echo '--disable-xss') + $(use whiteboarding && echo '--enable-whiteboarding')" + + echo ${confcmd} + ${confcmd} || die "configure failed" + ## Makefile is not always created... + #[[ ! -f Makefile ]] && die "configure failed" +} + +src_compile() { + emake || die "emake failed" + + if use autoreplyplugin; then + cd src/plugins/generic/autoreplyplugin + qmake + make + cd ../../../.. + fi + + if use otrplugin; then + cd src/plugins/generic/otrplugin + qmake + make + cd ../../../.. + fi + + if use watcherplugin; then + cd src/plugins/generic/watcherplugin + qmake + make + cd ../../../.. + fi +} + +src_install() { + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install + dodoc README TODO ChangeLog + + if use autoreplyplugin; then + cd src/plugins/generic/autoreplyplugin + + local plugindir="/usr/$(get_libdir)/psi-plus/plugins" + dodir "${plugindir}" + insinto "${plugindir}" + doins libautoreplyplugin.so + + cd ../../../.. + fi + + if use otrplugin; then + cd src/plugins/generic/otrplugin + + local plugindir="/usr/$(get_libdir)/psi-plus/plugins" + dodir "${plugindir}" + insinto "${plugindir}" + doins libotrplugin.so + + cd ../../../.. + fi + + if use watcherplugin; then + cd src/plugins/generic/watcherplugin + + local plugindir="/usr/$(get_libdir)/psi-plus/plugins" + dodir "${plugindir}" + insinto "${plugindir}" + doins libwatcherplugin.so + + cd ../../../.. + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-im/psi-plus/psi-plus-0.16.571.627.ebuild Mon Mar 20 07:20:37 2017 +0100 @@ -0,0 +1,138 @@ + +EAPI=5 + +inherit eutils l10n multilib gnome2-utils qt4-r2 + +DESCRIPTION="Qt4 Jabber client, with Licq-like interface" +HOMEPAGE="https://github.com/psi-plus/psi-plus-snapshots/" +SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/psi-plus-snapshots-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="autoreplyplugin crypt dbus debug doc jingle otrplugin plugins spell ssl xscreensaver watcherplugin whiteboarding" +#RESTRICT="test" + +RDEPEND="app-arch/unzip + >=dev-qt/qtgui-4.7:4 + >=app-crypt/qca-2.0.2:2[qt4(+)] + x11-libs/libX11 + dbus? ( >=dev-qt/qtdbus-4.7:4 ) + spell? ( >=app-text/enchant-1.3.0 ) + xscreensaver? ( x11-libs/libXScrnSaver ) + whiteboarding? ( dev-qt/qtsvg:4 ) + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )" + +DEPEND="${RDEPEND} + sys-devel/qconf + doc? ( app-doc/doxygen )" + +PDEPEND="crypt? ( app-crypt/qca:2[gpg] ) + jingle? ( net-im/psimedia + app-crypt/qca:2[ssl] ) + ssl? ( app-crypt/qca:2[ssl] ) + otrplugin? ( net-libs/libotr app-text/htmltidy )" + +src_prepare() { + epatch_user +} + +src_configure() { + # unable to use econf because of non-standard configure script + local confcmd="./configure + --prefix=/usr + --datadir=/usr/share + --libdir=/usr/lib64 + --disable-growl + --with-qca-inc=/usr/include/QtCrypto + --with-qca-lib=/usr/lib64 + $(use dbus || echo '--disable-qdbus') + $(use debug && echo '--debug') + $(use plugins && echo '--enable-plugins') + $(use spell || echo '--disable-aspell') + $(use spell || echo '--disable-enchant') + $(use xscreensaver || echo '--disable-xss') + $(use whiteboarding && echo '--enable-whiteboarding')" + + echo ${confcmd} + ${confcmd} || die "configure failed" + ## Makefile is not always created... + #[[ ! -f Makefile ]] && die "configure failed" +} + +src_compile() { + emake || die "emake failed" + + if use autoreplyplugin; then + cd src/plugins/generic/autoreplyplugin + qmake + make + cd ../../../.. + fi + + if use otrplugin; then + cd src/plugins/generic/otrplugin + qmake + make + cd ../../../.. + fi + + if use watcherplugin; then + cd src/plugins/generic/watcherplugin + qmake + make + cd ../../../.. + fi +} + +src_install() { + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install + dodoc README TODO ChangeLog + + if use autoreplyplugin; then + cd src/plugins/generic/autoreplyplugin + + local plugindir="/usr/$(get_libdir)/psi-plus/plugins" + dodir "${plugindir}" + insinto "${plugindir}" + doins libautoreplyplugin.so + + cd ../../../.. + fi + + if use otrplugin; then + cd src/plugins/generic/otrplugin + + local plugindir="/usr/$(get_libdir)/psi-plus/plugins" + dodir "${plugindir}" + insinto "${plugindir}" + doins libotrplugin.so + + cd ../../../.. + fi + + if use watcherplugin; then + cd src/plugins/generic/watcherplugin + + local plugindir="/usr/$(get_libdir)/psi-plus/plugins" + dodir "${plugindir}" + insinto "${plugindir}" + doins libwatcherplugin.so + + cd ../../../.. + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +}