Mercurial > hg > portage

changeset 394:323ff9881d83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the compilation for newer psi snapshots ...
author Dirk Olmes <dirk@xanthippe.ping.de>
date Thu, 11 Jun 2015 16:18:32 +0200
parents 1135ba64f157
children 041db1ee4881
files net-im/psi-plus/Manifest net-im/psi-plus/files/qmake.patch net-im/psi-plus/psi-plus-0.16.452.ebuild
diffstat 3 files changed, 198 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/net-im/psi-plus/Manifest	Wed Jun 03 14:49:47 2015 +0200
+++ b/net-im/psi-plus/Manifest	Thu Jun 11 16:18:32 2015 +0200
@@ -1,5 +1,7 @@
-AUX configure.patch 444 SHA256 f1089dadbd539c4b13e955d0ce534d29007d02033f3a8dd3b44e7ad6ae782a0d SHA512 fad2b631f2b7b240abbd22de8c2584300d9723cad1f0f841473a08e2027a875038b37aa1ea93507d7dd2cb1eff94bf1d2f52f9ddf21bef3b85221b3f0e03f302 WHIRLPOOL 3585e069a5dfcfd5909ebd26aca7949850a3d7a560fdc5a8ce719d68aa7c8c5323f7aa0fa6b8830f47405e28170be74ebb53d03a7d26f0ab9e978731745c9926
+AUX qmake.patch 2010 SHA256 39824af9a7c91764f0503a61ce6b5796ae5ab8b8d9ca7fa07460ade48860dc69 SHA512 8f8aaef67c10d0c7ca1fd7c2c3123258b5b5785b7dc5eb2a2c7d8667048ec209cf61c26eb5f51c5547a7204b976103bf992c345814576191b26f7766e5162b98 WHIRLPOOL b0cf1b7596d08df27be2c9365aca67e5b1aa7b95d49051066bb814c5770c382f9b982cac7dd102eb1be325b500301dd15d818883c21ac0514c3da2f880820cdc
 DIST 0.16.449.tar.gz 8277518 SHA256 3c3e0f464dc342f6803adca0294b6943d19113799c678bf58233a6dc59783e68 SHA512 8c1053e573ac255e0654fad430a065c9d67144a775e3cde47f0a94b07d642816630a2cee9e5e8e62da0f1f4d70c495289b525b40cbc8eea629fa316f3928f365 WHIRLPOOL cc304c34b639cd1c7d8a469f877612422e5e87153b8d21f51622ac6537d562ce3733b751264533bf24d2e215b73c3c5f51bf8d57d0068bf9624bde658ea50836
 DIST 0.16.451.tar.gz 8276448 SHA256 131ca10f8c7f57d90a21e7f1e2f5656366ef96ab4eefa625fc5b9e313d52c749 SHA512 e67eb9845d949effe9d23189ec60e6ba04b25e8b857fd8ed679ab7087d29c71065ed59cc45a5863f4c7626ff6a002e4a72c54791e4e8e64d739122d48a27546d WHIRLPOOL b04c082e5ff5fe75dfe536d5b2b6ebf6021388c43995875b40b49fb449243a2e025009df47910023f1acf1963525f8f6b25e284e788a9f53f736a4f97ae52791
+DIST 0.16.452.tar.gz 8275785 SHA256 d64f3d39804699878abe134a1b4aa64b9586307b0da6ef20477fb2db9beef327 SHA512 f530c620ffafe8365e54f9ebfab7fa966dceb3858c43ab6baf89b4a0d196db39fe1887f9ee92120301b163b3f37f6e30acb09cc397d55636fe38a531a7ab0d21 WHIRLPOOL 624c902f20f89342956d0e275207762d6a8afd98dfe908b3e2e036fa842dadea931c29776fa9320ed644b3477b5c5f9bc8941170011b18b1d931f764c45e64d7
 EBUILD psi-plus-0.16.449.ebuild 2966 SHA256 5e7331db84666a4625faa78ca36fe70356c9095fbe31acd7410e638b8ca0c707 SHA512 c31e89d6b6049c0224ab6882983dde0171505ecde8e2435bd022a6c4a8f9e489e79998f5b2d2d9702c78b51e4e98d4ef2374263d6ee0dc8da220b944da3157c5 WHIRLPOOL 19e29f9de540fbadb3a186c0599506a4f34b98a53fde56d0a4a8c8bb24c787237876cff8e50766374f0900e2f5b82b2c832bb042e05a8cbdd0eb1fe1046be985
 EBUILD psi-plus-0.16.451.ebuild 3005 SHA256 9219c6eae1424b0bad2849438c489a2026470449e3b740415313c9cffc74c7c8 SHA512 918d5ef71fac33a92e4b327f5aef4e34122f3329549311a230be0f2fc9922d1dfd8d93a6640b65cc21d9bed23741e848619ff0b00097b7f1309400055f1eef72 WHIRLPOOL de95536df386b114e2ea6af64edcf8ca270ebfff02bd1bb29b705b7f70b580ff20772ea90499240654260d23616b7ee1576026ec69a7739bff8f1ffb08e37872
+EBUILD psi-plus-0.16.452.ebuild 3000 SHA256 eaef0e973d0d6cdb366f3e73f0b307607748b463a0786d845904b05c513fa081 SHA512 b5ef6164b97911617e84ba9eda2d40b5a2a29715168d777e619fb5bf66bb48560106f8fb873beb66e9d5dd1af4be3c3dd2a34b6fbef0b40d1bc54dedf8e512dd WHIRLPOOL 639459e6af5d671f97ebfe30a5d803cb5f82667e1d1f97b62c2e53fc47f9c197355fe140ea4e524249326a27be712811678f4b84ff0518e1674c13af663df85c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/files/qmake.patch	Thu Jun 11 16:18:32 2015 +0200
@@ -0,0 +1,58 @@
+diff -rNu psi-plus-snapshots-0.16.452/initvars.pro psi-plus-snapshots-0.16.451/initvars.pro
+--- psi-plus-snapshots-0.16.452/initvars.pro	1970-01-01 01:00:00.000000000 +0100
++++ psi-plus-snapshots-0.16.451/initvars.pro	2015-04-25 21:15:09.000000000 +0200
+@@ -0,0 +1,4 @@
++TEMPLATE=subdirs
++SUBDIRS= # don't build anything, we're just generating the .qmake.cache file
++QMAKE_SUBSTITUTES += .qmake.cache.in
++
+diff -rNu psi-plus-snapshots-0.16.452/iris/iris.pro psi-plus-snapshots-0.16.451/iris/iris.pro
+--- psi-plus-snapshots-0.16.452/iris/iris.pro	2015-04-28 21:15:12.000000000 +0200
++++ psi-plus-snapshots-0.16.451/iris/iris.pro	2015-04-25 21:15:09.000000000 +0200
+@@ -1,7 +1,8 @@
+ TEMPLATE = subdirs
+ 
+ IRIS_BASE = $$PWD
+-include($$top_iris_builddir/conf.pri)
++
++include(conf.pri)
+ windows:include(conf_win.pri)
+ 
+ include(common.pri)
+diff -rNu psi-plus-snapshots-0.16.452/psi.pro psi-plus-snapshots-0.16.451/psi.pro
+--- psi-plus-snapshots-0.16.452/psi.pro	2015-04-28 21:15:12.000000000 +0200
++++ psi-plus-snapshots-0.16.451/psi.pro	2015-04-25 21:15:09.000000000 +0200
+@@ -1,6 +1,6 @@
+ TEMPLATE = subdirs
+ 
+-include($$top_builddir/conf.pri)
++include(conf.pri)
+ 
+ # configure iris
+ unix:system("echo \"include($$top_srcdir/src/conf_iris.pri)\" > $$top_builddir/iris/conf.pri")
+@@ -8,6 +8,14 @@
+ 
+ sub_iris.subdir = iris
+ sub_src.subdir = src
++
++!greaterThan(QT_MAJOR_VERSION, 4) {
++	sub_initvars.file = initvars.pro
++	sub_iris.depends = sub_initvars
++	sub_src.depends = sub_initvars
++	SUBDIRS += sub_initvars
++}
++
+ sub_src.depends += sub_iris
+ 
+ SUBDIRS += \
+diff -rNu psi-plus-snapshots-0.16.452/.qmake.cache.in psi-plus-snapshots-0.16.451/.qmake.cache.in
+--- psi-plus-snapshots-0.16.452/.qmake.cache.in	2015-04-28 21:15:12.000000000 +0200
++++ psi-plus-snapshots-0.16.451/.qmake.cache.in	2015-04-25 21:15:09.000000000 +0200
+@@ -1,3 +1,3 @@
+-top_srcdir=@@source_dir@@
+-top_builddir=@@build_dir@@
+-top_iris_builddir=@@build_dir@@/iris
++top_srcdir=$$PWD
++top_builddir=$$OUT_PWD
++top_iris_builddir=$$OUT_PWD/iris
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/psi-plus/psi-plus-0.16.452.ebuild	Thu Jun 11 16:18:32 2015 +0200
@@ -0,0 +1,137 @@
+
+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"
+
+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 "${FILESDIR}/qmake.patch"
+	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
+		$(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
+}