| 1 |
hasufell 13/11/01 22:02:48 |
| 2 |
|
| 3 |
Modified: jabberd2-2.2.17.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
cosmetics |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-im/jabberd2/jabberd2-2.2.17.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/jabberd2-2.2.17.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/jabberd2-2.2.17.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/jabberd2-2.2.17.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: jabberd2-2.2.17.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.17.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- jabberd2-2.2.17.ebuild 1 Nov 2013 21:50:22 -0000 1.1 |
| 23 |
+++ jabberd2-2.2.17.ebuild 1 Nov 2013 22:02:48 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.17.ebuild,v 1.1 2013/11/01 21:50:22 hasufell Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.17.ebuild,v 1.2 2013/11/01 22:02:48 hasufell Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -42,6 +42,24 @@ |
| 33 |
|
| 34 |
S=${WORKDIR}/jabberd-${PV} |
| 35 |
|
| 36 |
+src_prepare() { |
| 37 |
+ # Fix some default directory locations |
| 38 |
+ sed -i \ |
| 39 |
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
| 40 |
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
| 41 |
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
| 42 |
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
| 43 |
+ -e 's,@localstatedir@,/var/spool,g' \ |
| 44 |
+ -e 's,@package@,jabber,g' \ |
| 45 |
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die |
| 46 |
+ |
| 47 |
+ # If the package wasn't merged with sqlite then default to use berkdb |
| 48 |
+ use sqlite || |
| 49 |
+ sed -i \ |
| 50 |
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
| 51 |
+ etc/{c2s,sm}.xml.dist.in || die |
| 52 |
+} |
| 53 |
+ |
| 54 |
src_configure() { |
| 55 |
# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |
| 56 |
replace-flags -O[3s] -O2 |
| 57 |
@@ -66,24 +84,6 @@ |
| 58 |
$(use_with zlib) |
| 59 |
} |
| 60 |
|
| 61 |
-src_prepare() { |
| 62 |
- # Fix some default directory locations |
| 63 |
- sed -i \ |
| 64 |
- -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
| 65 |
- -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
| 66 |
- -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
| 67 |
- -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
| 68 |
- -e 's,@localstatedir@,/var/spool,g' \ |
| 69 |
- -e 's,@package@,jabber,g' \ |
| 70 |
- etc/{sm,router,c2s,s2s}.xml.dist.in || die |
| 71 |
- |
| 72 |
- # If the package wasn't merged with sqlite then default to use berkdb |
| 73 |
- use sqlite || |
| 74 |
- sed -i \ |
| 75 |
- -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
| 76 |
- etc/{c2s,sm}.xml.dist.in || die |
| 77 |
-} |
| 78 |
- |
| 79 |
src_install() { |
| 80 |
default |
| 81 |
prune_libtool_files --modules |
| 82 |
@@ -119,7 +119,6 @@ |
| 83 |
echo |
| 84 |
einfo 'You will need to setup or update your database using the' |
| 85 |
einfo "scripts in /usr/share/doc/${PF}/tools/" |
| 86 |
- einfo 'e.g. bzcat db-setup.sqlite.bz2 | sqlite3 /var/spool/jabber/db/sqlite.db' |
| 87 |
echo |
| 88 |
fi |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.44 net-im/jabberd2/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/ChangeLog?rev=1.44&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/ChangeLog?rev=1.44&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/ChangeLog?r1=1.43&r2=1.44 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v |
| 102 |
retrieving revision 1.43 |
| 103 |
retrieving revision 1.44 |
| 104 |
diff -u -r1.43 -r1.44 |
| 105 |
--- ChangeLog 1 Nov 2013 21:50:22 -0000 1.43 |
| 106 |
+++ ChangeLog 1 Nov 2013 22:02:48 -0000 1.44 |
| 107 |
@@ -1,6 +1,9 @@ |
| 108 |
# ChangeLog for net-im/jabberd2 |
| 109 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.43 2013/11/01 21:50:22 hasufell Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.44 2013/11/01 22:02:48 hasufell Exp $ |
| 112 |
+ |
| 113 |
+ 01 Nov 2013; Julian Ospald <hasufell@g.o> jabberd2-2.2.17.ebuild: |
| 114 |
+ cosmetics |
| 115 |
|
| 116 |
*jabberd2-2.2.17 (01 Nov 2013) |
Archives