Gentoo Archives: gentoo-commits

From: Austin English <wizardedit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/gg-transport/, net-im/gg-transport/files/
Date: Wed, 27 Apr 2016 23:40:36
Message-Id: 1461800386.ac5c9dab8b68fcf1e7187939e4213cbb1f96e4e1.wizardedit@gentoo
1 commit: ac5c9dab8b68fcf1e7187939e4213cbb1f96e4e1
2 Author: Austin English <wizardedit <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 23:39:33 2016 +0000
4 Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 23:39:46 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac5c9dab
7
8 net-im/gg-transport: use #!/sbin/openrc-run instead of #!/sbin/runscript
9
10 Gentoo-Bug: https://bugs.gentoo.org/573846
11
12 Also update to EAPI=6 and remove an unneeded file
13
14 Package-Manager: portage-2.2.26
15
16 net-im/gg-transport/files/jggtrans-2.2.2-r1 | 20 ----------
17 net-im/gg-transport/files/jggtrans-2.2.4 | 4 +-
18 net-im/gg-transport/gg-transport-2.2.4-r1.ebuild | 48 ++++++++++++++++++++++++
19 3 files changed, 50 insertions(+), 22 deletions(-)
20
21 diff --git a/net-im/gg-transport/files/jggtrans-2.2.2-r1 b/net-im/gg-transport/files/jggtrans-2.2.2-r1
22 deleted file mode 100644
23 index 7e38a40..0000000
24 --- a/net-im/gg-transport/files/jggtrans-2.2.2-r1
25 +++ /dev/null
26 @@ -1,20 +0,0 @@
27 -#!/sbin/runscript
28 -# Copyright 1999-2006 Gentoo Foundation
29 -# Distributed under the terms of the GNU General Public License v2
30 -# $Id$
31 -
32 -depend() {
33 - after net jabber-server
34 -}
35 -
36 -start() {
37 - ebegin "Starting Jabber GG Transport"
38 - start-stop-daemon --start --user jabber --group jabber --exec /usr/sbin/jggtrans -- -u jabber -g jabber /etc/jabber/jggtrans.xml
39 - eend $?
40 -}
41 -
42 -stop() {
43 - ebegin "Stopping Jabber GG Transport"
44 - start-stop-daemon --stop --pidfile /var/run/jabber/jggtrans.pid
45 - eend $?
46 -}
47
48 diff --git a/net-im/gg-transport/files/jggtrans-2.2.4 b/net-im/gg-transport/files/jggtrans-2.2.4
49 index 7e38a40..2832784 100644
50 --- a/net-im/gg-transport/files/jggtrans-2.2.4
51 +++ b/net-im/gg-transport/files/jggtrans-2.2.4
52 @@ -1,5 +1,5 @@
53 -#!/sbin/runscript
54 -# Copyright 1999-2006 Gentoo Foundation
55 +#!/sbin/openrc-run
56 +# Copyright 1999-2016 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Id$
59
60
61 diff --git a/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild b/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
62 new file mode 100644
63 index 0000000..789f3fb
64 --- /dev/null
65 +++ b/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
66 @@ -0,0 +1,48 @@
67 +# Copyright 1999-2016 Gentoo Foundation
68 +# Distributed under the terms of the GNU General Public License v2
69 +# $Id$
70 +
71 +EAPI=6
72 +
73 +DESCRIPTION="Gadu-Gadu transport for Jabber"
74 +HOMEPAGE="https://github.com/Jajcus/jggtrans"
75 +SRC_URI="mirror://github/Jajcus/jggtrans/jggtrans-${PV}.tar.gz"
76 +
77 +LICENSE="GPL-2"
78 +SLOT="0"
79 +KEYWORDS="amd64 x86"
80 +IUSE=""
81 +
82 +RDEPEND=">=net-im/jabber-base-0.01
83 + >=dev-libs/glib-2.6.4
84 + net-dns/libidn
85 + >=net-libs/libgadu-1.9.0_rc3
86 + dev-libs/expat"
87 +DEPEND="${RDEPEND}
88 + virtual/pkgconfig"
89 +
90 +S="${WORKDIR}/jggtrans-${PV}"
91 +
92 +src_install() {
93 + emake DESTDIR="${D}" install
94 +
95 + keepdir /var/spool/jabber/gg
96 + keepdir /var/run/jabber
97 + keepdir /var/log/jabber
98 + fowners jabber:jabber /var/spool/jabber/gg
99 + fowners jabber:jabber /var/run/jabber
100 + fowners jabber:jabber /var/log/jabber
101 +
102 + newinitd "${FILESDIR}/jggtrans-${PVR}" jggtrans
103 +
104 + insinto /etc/jabber
105 + doins jggtrans.xml
106 +
107 + sed -i \
108 + -e 's,/var/lib/jabber/spool/gg.localhost/,/var/spool/jabber/gg/,' \
109 + -e 's,/var/lib/jabber/ggtrans.pid,/var/run/jabber/jggtrans.pid,' \
110 + -e 's,/tmp/ggtrans.log,/var/log/jabber/jggtrans.log,' \
111 + "${D}/etc/jabber/jggtrans.xml" || die "sed failed"
112 +
113 + dodoc AUTHORS ChangeLog README README.Pl NEWS
114 +}