From: Markus Ullmann Date: Wed, 12 Mar 2008 19:58:06 +0000 (+0000) Subject: Quoting fix and version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f85ac18a7a7172361b48f02c134fd379395ce2db;p=gentoo.git Quoting fix and version bump Package-Manager: portage-2.1.4.4 --- diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog index c6660da141e9..6718e53359db 100644 --- a/net-im/openfire/ChangeLog +++ b/net-im/openfire/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-im/openfire # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.14 2008/01/17 14:42:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.15 2008/03/12 19:58:04 jokey Exp $ + +*openfire-3.4.5 (12 Mar 2008) + + 12 Mar 2008; Markus Ullmann + -files/buildxml-3.3.2.patch, -files/buildxml-3.3.3.patch, + -files/buildxml-3.4.1.patch, -files/buildxml-3.4.3.patch, + -files/buildxml-3.4.4.patch, +files/buildxml.patch, + -files/conf.d/openfire, -files/init.d/openfire, +files/openfire-confd, + +files/openfire-initd, openfire-3.3.2.ebuild, openfire-3.3.3.ebuild, + openfire-3.4.1.ebuild, openfire-3.4.3.ebuild, openfire-3.4.4.ebuild, + +openfire-3.4.5.ebuild: + Quoting fix and version bump 17 Jan 2008; Vlastimil Babka openfire-3.3.2.ebuild, openfire-3.3.3.ebuild, openfire-3.4.1.ebuild, openfire-3.4.3.ebuild: diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest index 20026e1bafba..919bedf8bc68 100644 --- a/net-im/openfire/Manifest +++ b/net-im/openfire/Manifest @@ -1,19 +1,27 @@ -AUX buildxml-3.3.2.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 -AUX buildxml-3.3.3.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 -AUX buildxml-3.4.1.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 -AUX buildxml-3.4.3.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 -AUX buildxml-3.4.4.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 -AUX conf.d/openfire 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5 -AUX init.d/openfire 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264ab08172d7559b79a927395ca32926e9da4cf8 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX buildxml.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 +AUX openfire-confd 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5 +AUX openfire-initd 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264ab08172d7559b79a927395ca32926e9da4cf8 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac DIST openfire_src_3_3_2.tar.gz 48712324 RMD160 f1397c0d6f4710e39b0c3d110c70de7834172cb6 SHA1 115e8964dc762f58a308497cc170d6f6355ef137 SHA256 bf8d3a7561d5a569c8fd5e22f384f56c6d6fcabd0a5167240590d873fa0a8377 DIST openfire_src_3_3_3.tar.gz 54051765 RMD160 d002c9f507e06c8f491238f998b854263c139843 SHA1 f508a61840da06460328a86337fc0423a3aea5c2 SHA256 e52a60f8d9042a9e58b81701d4dead5889caa999d40f6e20bca7eb1c5fef5338 DIST openfire_src_3_4_1.tar.gz 56221075 RMD160 ed955b8d048504a44064007a001a137b91bcefef SHA1 fda1986113664d3c6f12b06cda7c92b688f2b206 SHA256 ed0e914f9eb260d5be9cdd97fb2ca6d28699478e0da746f5f72b379a0f6c6a01 DIST openfire_src_3_4_3.tar.gz 48954094 RMD160 156313f592972bd28923ff3a8aa0a5744c89a699 SHA1 a17b87305a96b6215fc9dfc14388b7b78fefa8a1 SHA256 c09a1f2f3da89850bc904d2ecdeb49f0b584f1b711e35b13ff3fe08c14eba973 DIST openfire_src_3_4_4.tar.gz 48393969 RMD160 32a85e1d348813d4cbdb7e0016ba0b777af0dbce SHA1 62ef0982b660db69a35a086d62ae6a9ba4d1725d SHA256 0a3794ce5db9d2d16091d6eb6c1d4d4f8f1065f65e6fc4b3bd512dfb414be924 -EBUILD openfire-3.3.2.ebuild 2725 RMD160 9d969909698fdf35a09eb21a7f743d8bbc683fed SHA1 c8ce7cc5d83a433e486448703a020df40dc278be SHA256 9ddfc08caaa16aad5530bffe4e4f877dd9c94084e50baacfed6403eb20c34120 -EBUILD openfire-3.3.3.ebuild 2727 RMD160 388f376167cfafed275fc6b99a554d50276fe9ff SHA1 8407ce36d765a3e6124927008a92a37fb6f708f0 SHA256 010ce6f58440120e3eea3a53730031adfdb06b51a4248bdaa932f7e2bc52de9f -EBUILD openfire-3.4.1.ebuild 2727 RMD160 6f6ecc195d930cbed2ce43d375df5d88b44021c0 SHA1 0149c69cf94d0eed6ff68632489d1ddb71b4b1f6 SHA256 3301396f751c50594bfb99b2ed53b371e7e45338ab013caa0637ece0709822d3 -EBUILD openfire-3.4.3.ebuild 2727 RMD160 490b127ad1b97e1fc4a64bcc3d3b93fb83af6a05 SHA1 6dc2e394e4e7c44aec533df1d7fb062c6f1928a1 SHA256 c2fe4740cc6fdb04a2e926c480e4ddcb3ed13ab017c63d52ed5b0362d535338a -EBUILD openfire-3.4.4.ebuild 2729 RMD160 6b30b49a74ad62bb9487455ccfb37c2b437b1526 SHA1 ef0e54cbc77116a0de0dde9a6a983bc1f00124cc SHA256 f3923e0a01d335d7a90d6bc8760538675bd854c6ff3689db3865be4bfa004aa5 -MISC ChangeLog 6757 RMD160 e9004f559bb374e75b3309a26913e7d5e303f75b SHA1 86a08b8a041f8c61b860879fbec4e1062fc22395 SHA256 db4c27966e821f167712fde19178fb60e9b23d7b0b80a13d5f3a3825ca8e55bd +DIST openfire_src_3_4_5.tar.gz 48799040 RMD160 668defe28b8ff4fd990c06df4ccd7eadce79bb48 SHA1 d370abf81b4603a7dabc58407548b2b24001fb80 SHA256 52330c8b51e3677dcbc18ca3045592583b02fba353deba4117fbe5297e127bd1 +EBUILD openfire-3.3.2.ebuild 2726 RMD160 7f3373d220131bac1d4f18f0ac2c275c0ee05f47 SHA1 e9162faea3e456c2818696805511a2dccc90a017 SHA256 b5b9eb5693d22e7c1238a86c351f4afe3c048d4b212961fbca6a2310b3db6386 +EBUILD openfire-3.3.3.ebuild 2728 RMD160 32e3843142ba491165741772544eb17f4e1a86b4 SHA1 e0211b2df49a283249592f2761f58a3d4c3883a1 SHA256 a2a8ef5f8b86a6eaff442b14d9f01139a6bd37ab804af01b5e06e3b060e54553 +EBUILD openfire-3.4.1.ebuild 2728 RMD160 445393cf92e3f9d6ed4e36d21964f0e3caedd179 SHA1 d7730ba27f37e70d01cee1055eb118781bb6c47e SHA256 13c0bbe77408244ba5dc1174b9d97944855ba654fb493298a415dc9f77cb7709 +EBUILD openfire-3.4.3.ebuild 2728 RMD160 3a389697f86d466f4a88d6d40264c3980a616b26 SHA1 f34aaa2e590b468b307581d2ab6e5dc7bef7366f SHA256 c43d467a6ebc56349745475764bd8f6b18860e5929fe143003a34eb5dab88187 +EBUILD openfire-3.4.4.ebuild 2728 RMD160 e3db4d71686564849996fa833693fe2191ae56af SHA1 55c82ed933d35ca77583c843934efdcb6b6861cf SHA256 e27b4ef2ff8ca314db36d66618f4186822af388da7b48e7ad73bbd131d9c0392 +EBUILD openfire-3.4.5.ebuild 2728 RMD160 72f5423894bb44d95cafb2f58f5a14f5b682966d SHA1 5bf2d3dc4736708fc6b05477b08f2acd0da514c7 SHA256 427d3cb9f1c8778abbcca4c3597312c438d7b929ba22ddee526b78a552a2ac4e +MISC ChangeLog 7283 RMD160 a3f1c1fb43b6c358959eb0043c280e171bdd2985 SHA1 1e77549c1e90cc682485171b903f8fb9a3e9f0b2 SHA256 abe0925217bbeb3f9d720d709ea3f9a6455ec2336a1204a9667d6763a4b60b28 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH2DXbz974XjDVpbkRAmQ/AKCKmTa9aOu/bTRSFItNT0R0e46ASwCg0Ea6 +3iFt2fy1Z6vm7KgTzfhRKwY= +=Mhal +-----END PGP SIGNATURE----- diff --git a/net-im/openfire/files/buildxml-3.3.3.patch b/net-im/openfire/files/buildxml-3.3.3.patch deleted file mode 100644 index eb52f286d250..000000000000 --- a/net-im/openfire/files/buildxml-3.3.3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- build/build.xml 2007-04-13 21:00:32.000000000 +0000 -+++ build/build.xml 2007-04-16 23:11:05.000000000 +0000 -@@ -1133,7 +1133,7 @@ - - - -- -+ - - - -@@ -1143,7 +1143,7 @@ - - - -- -+ - - - diff --git a/net-im/openfire/files/buildxml-3.4.1.patch b/net-im/openfire/files/buildxml-3.4.1.patch deleted file mode 100644 index eb52f286d250..000000000000 --- a/net-im/openfire/files/buildxml-3.4.1.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- build/build.xml 2007-04-13 21:00:32.000000000 +0000 -+++ build/build.xml 2007-04-16 23:11:05.000000000 +0000 -@@ -1133,7 +1133,7 @@ - - - -- -+ - - - -@@ -1143,7 +1143,7 @@ - - - -- -+ - - - diff --git a/net-im/openfire/files/buildxml-3.4.3.patch b/net-im/openfire/files/buildxml-3.4.3.patch deleted file mode 100644 index eb52f286d250..000000000000 --- a/net-im/openfire/files/buildxml-3.4.3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- build/build.xml 2007-04-13 21:00:32.000000000 +0000 -+++ build/build.xml 2007-04-16 23:11:05.000000000 +0000 -@@ -1133,7 +1133,7 @@ - - - -- -+ - - - -@@ -1143,7 +1143,7 @@ - - - -- -+ - - - diff --git a/net-im/openfire/files/buildxml-3.4.4.patch b/net-im/openfire/files/buildxml-3.4.4.patch deleted file mode 100644 index eb52f286d250..000000000000 --- a/net-im/openfire/files/buildxml-3.4.4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- build/build.xml 2007-04-13 21:00:32.000000000 +0000 -+++ build/build.xml 2007-04-16 23:11:05.000000000 +0000 -@@ -1133,7 +1133,7 @@ - - - -- -+ - - - -@@ -1143,7 +1143,7 @@ - - - -- -+ - - - diff --git a/net-im/openfire/files/buildxml-3.3.2.patch b/net-im/openfire/files/buildxml.patch similarity index 100% rename from net-im/openfire/files/buildxml-3.3.2.patch rename to net-im/openfire/files/buildxml.patch diff --git a/net-im/openfire/files/conf.d/openfire b/net-im/openfire/files/openfire-confd similarity index 100% rename from net-im/openfire/files/conf.d/openfire rename to net-im/openfire/files/openfire-confd diff --git a/net-im/openfire/files/init.d/openfire b/net-im/openfire/files/openfire-initd old mode 100755 new mode 100644 similarity index 100% rename from net-im/openfire/files/init.d/openfire rename to net-im/openfire/files/openfire-initd diff --git a/net-im/openfire/openfire-3.3.2.ebuild b/net-im/openfire/openfire-3.3.2.ebuild index ac461d9a1f99..5426df4f32d4 100644 --- a/net-im/openfire/openfire-3.3.2.ebuild +++ b/net-im/openfire/openfire-3.3.2.ebuild @@ -1,23 +1,18 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.2.ebuild,v 1.2 2008/01/17 14:42:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.2.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server" HOMEPAGE="http://www.igniterealtime.org/projects/openfire/" SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz" -RESTRICT="" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 x86" IUSE="doc" -# For transports -PROVIDE="virtual/jabber-server" - RDEPEND=">=virtual/jre-1.5" DEPEND="net-im/jabber-base dev-java/ant-contrib @@ -25,6 +20,11 @@ DEPEND="net-im/jabber-base S=${WORKDIR}/${PN//-/_}_src +RESTRICT="" + +# For transports +PROVIDE="virtual/jabber-server" + pkg_setup() { if [ -f /etc/env.d/98openfire ]; then einfo "This is an upgrade" @@ -39,8 +39,8 @@ pkg_setup() { src_unpack() { unpack ${PN//-/_}_src_${PV//./_}.tar.gz - cd ${S} - epatch ${FILESDIR}/buildxml-${PV}.patch + cd "${S}" + epatch "${FILESDIR}"/buildxml.patch # TODO should replace jars in build/lib with ones packaged by us -nichoj } @@ -56,8 +56,8 @@ src_compile() { src_install() { dodir /opt/openfire - doinitd ${FILESDIR}/init.d/openfire - doconfd ${FILESDIR}/conf.d/openfire + doinitd "${FILESDIR}"/openfire-initd + doconfd "${FILESDIR}"/openfire-confd dodir /opt/openfire/conf insinto /opt/openfire/conf @@ -85,7 +85,7 @@ src_install() { #Protect ssl key on upgrade dodir /etc/env.d/ - echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > ${D}/etc/env.d/98openfire + echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire } pkg_postinst() { diff --git a/net-im/openfire/openfire-3.3.3.ebuild b/net-im/openfire/openfire-3.3.3.ebuild index 7a2fc5b4d24f..144fc214568a 100644 --- a/net-im/openfire/openfire-3.3.3.ebuild +++ b/net-im/openfire/openfire-3.3.3.ebuild @@ -1,23 +1,18 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.3.ebuild,v 1.2 2008/01/17 14:42:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.3.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server" HOMEPAGE="http://www.igniterealtime.org/projects/openfire/" SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz" -RESTRICT="" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~x86" IUSE="doc" -# For transports -PROVIDE="virtual/jabber-server" - RDEPEND=">=virtual/jre-1.5" DEPEND="net-im/jabber-base dev-java/ant-contrib @@ -25,6 +20,11 @@ DEPEND="net-im/jabber-base S=${WORKDIR}/${PN//-/_}_src +RESTRICT="" + +# For transports +PROVIDE="virtual/jabber-server" + pkg_setup() { if [ -f /etc/env.d/98openfire ]; then einfo "This is an upgrade" @@ -39,8 +39,8 @@ pkg_setup() { src_unpack() { unpack ${PN//-/_}_src_${PV//./_}.tar.gz - cd ${S} - epatch ${FILESDIR}/buildxml-${PV}.patch + cd "${S}" + epatch "${FILESDIR}"/buildxml.patch # TODO should replace jars in build/lib with ones packaged by us -nichoj } @@ -56,8 +56,8 @@ src_compile() { src_install() { dodir /opt/openfire - doinitd ${FILESDIR}/init.d/openfire - doconfd ${FILESDIR}/conf.d/openfire + doinitd "${FILESDIR}"/openfire-initd + doconfd "${FILESDIR}"/openfire-confd dodir /opt/openfire/conf insinto /opt/openfire/conf @@ -85,7 +85,7 @@ src_install() { #Protect ssl key on upgrade dodir /etc/env.d/ - echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > ${D}/etc/env.d/98openfire + echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire } pkg_postinst() { diff --git a/net-im/openfire/openfire-3.4.1.ebuild b/net-im/openfire/openfire-3.4.1.ebuild index e5e2f3709e93..d7219ab2ed7a 100644 --- a/net-im/openfire/openfire-3.4.1.ebuild +++ b/net-im/openfire/openfire-3.4.1.ebuild @@ -1,23 +1,18 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.1.ebuild,v 1.2 2008/01/17 14:42:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.1.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server" HOMEPAGE="http://www.igniterealtime.org/projects/openfire/" SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz" -RESTRICT="" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~x86" IUSE="doc" -# For transports -PROVIDE="virtual/jabber-server" - RDEPEND=">=virtual/jre-1.5" DEPEND="net-im/jabber-base dev-java/ant-contrib @@ -25,6 +20,11 @@ DEPEND="net-im/jabber-base S=${WORKDIR}/${PN//-/_}_src +RESTRICT="" + +# For transports +PROVIDE="virtual/jabber-server" + pkg_setup() { if [ -f /etc/env.d/98openfire ]; then einfo "This is an upgrade" @@ -39,8 +39,8 @@ pkg_setup() { src_unpack() { unpack ${PN//-/_}_src_${PV//./_}.tar.gz - cd ${S} - epatch ${FILESDIR}/buildxml-${PV}.patch + cd "${S}" + epatch "${FILESDIR}"/buildxml.patch # TODO should replace jars in build/lib with ones packaged by us -nichoj } @@ -56,8 +56,8 @@ src_compile() { src_install() { dodir /opt/openfire - doinitd ${FILESDIR}/init.d/openfire - doconfd ${FILESDIR}/conf.d/openfire + doinitd "${FILESDIR}"/openfire-initd + doconfd "${FILESDIR}"/openfire-confd dodir /opt/openfire/conf insinto /opt/openfire/conf @@ -85,7 +85,7 @@ src_install() { #Protect ssl key on upgrade dodir /etc/env.d/ - echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > ${D}/etc/env.d/98openfire + echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire } pkg_postinst() { diff --git a/net-im/openfire/openfire-3.4.3.ebuild b/net-im/openfire/openfire-3.4.3.ebuild index b2810970eb22..b4bd62dcbaa1 100644 --- a/net-im/openfire/openfire-3.4.3.ebuild +++ b/net-im/openfire/openfire-3.4.3.ebuild @@ -1,23 +1,18 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.3.ebuild,v 1.2 2008/01/17 14:42:37 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.3.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server" HOMEPAGE="http://www.igniterealtime.org/projects/openfire/" SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz" -RESTRICT="" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~x86" IUSE="doc" -# For transports -PROVIDE="virtual/jabber-server" - RDEPEND=">=virtual/jre-1.5" DEPEND="net-im/jabber-base dev-java/ant-contrib @@ -25,6 +20,11 @@ DEPEND="net-im/jabber-base S=${WORKDIR}/${PN//-/_}_src +RESTRICT="" + +# For transports +PROVIDE="virtual/jabber-server" + pkg_setup() { if [ -f /etc/env.d/98openfire ]; then einfo "This is an upgrade" @@ -39,8 +39,8 @@ pkg_setup() { src_unpack() { unpack ${PN//-/_}_src_${PV//./_}.tar.gz - cd ${S} - epatch ${FILESDIR}/buildxml-${PV}.patch + cd "${S}" + epatch "${FILESDIR}"/buildxml.patch # TODO should replace jars in build/lib with ones packaged by us -nichoj } @@ -56,8 +56,8 @@ src_compile() { src_install() { dodir /opt/openfire - doinitd ${FILESDIR}/init.d/openfire - doconfd ${FILESDIR}/conf.d/openfire + doinitd "${FILESDIR}"/openfire-initd + doconfd "${FILESDIR}"/openfire-confd dodir /opt/openfire/conf insinto /opt/openfire/conf @@ -85,7 +85,7 @@ src_install() { #Protect ssl key on upgrade dodir /etc/env.d/ - echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > ${D}/etc/env.d/98openfire + echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire } pkg_postinst() { diff --git a/net-im/openfire/openfire-3.4.4.ebuild b/net-im/openfire/openfire-3.4.4.ebuild index aa1ecad29b89..da8219970906 100644 --- a/net-im/openfire/openfire-3.4.4.ebuild +++ b/net-im/openfire/openfire-3.4.4.ebuild @@ -1,23 +1,18 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.4.ebuild,v 1.1 2008/01/25 00:19:05 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.4.ebuild,v 1.2 2008/03/12 19:58:04 jokey Exp $ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server" HOMEPAGE="http://www.igniterealtime.org/projects/openfire/" SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz" -RESTRICT="" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~x86" IUSE="doc" -# For transports -PROVIDE="virtual/jabber-server" - RDEPEND=">=virtual/jre-1.5" DEPEND="net-im/jabber-base dev-java/ant-contrib @@ -25,6 +20,11 @@ DEPEND="net-im/jabber-base S=${WORKDIR}/${PN//-/_}_src +RESTRICT="" + +# For transports +PROVIDE="virtual/jabber-server" + pkg_setup() { if [ -f /etc/env.d/98openfire ]; then einfo "This is an upgrade" @@ -39,8 +39,8 @@ pkg_setup() { src_unpack() { unpack ${PN//-/_}_src_${PV//./_}.tar.gz - cd ${S} - epatch ${FILESDIR}/buildxml-${PV}.patch + cd "${S}" + epatch "${FILESDIR}"/buildxml.patch # TODO should replace jars in build/lib with ones packaged by us -nichoj } @@ -56,8 +56,8 @@ src_compile() { src_install() { dodir /opt/openfire - doinitd ${FILESDIR}/init.d/openfire - doconfd ${FILESDIR}/conf.d/openfire + doinitd "${FILESDIR}"/openfire-initd + doconfd "${FILESDIR}"/openfire-confd dodir /opt/openfire/conf insinto /opt/openfire/conf @@ -85,7 +85,7 @@ src_install() { #Protect ssl key on upgrade dodir /etc/env.d/ - echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > ${D}/etc/env.d/98openfire + echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire } pkg_postinst() { diff --git a/net-im/openfire/openfire-3.4.5.ebuild b/net-im/openfire/openfire-3.4.5.ebuild new file mode 100644 index 000000000000..8b036e692abf --- /dev/null +++ b/net-im/openfire/openfire-3.4.5.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.5.ebuild,v 1.1 2008/03/12 19:58:04 jokey Exp $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server" +HOMEPAGE="http://www.igniterealtime.org/projects/openfire/" +SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=">=virtual/jre-1.5" +DEPEND="net-im/jabber-base + dev-java/ant-contrib + >=virtual/jdk-1.5" + +S=${WORKDIR}/${PN//-/_}_src + +RESTRICT="" + +# For transports +PROVIDE="virtual/jabber-server" + +pkg_setup() { + if [ -f /etc/env.d/98openfire ]; then + einfo "This is an upgrade" + else + ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:" + ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire " + ewarn "For more info see bug #139708" + sleep 11 + fi + java-pkg-2_pkg_setup +} + +src_unpack() { + unpack ${PN//-/_}_src_${PV//./_}.tar.gz + cd "${S}" + epatch "${FILESDIR}"/buildxml.patch + + # TODO should replace jars in build/lib with ones packaged by us -nichoj +} + +src_compile() { + # Jikes doesn't support -source 1.5 + java-pkg_filter-compiler jikes + + ANT_TASKS="ant-contrib" + eant -f build/build.xml openfire plugins $(use_doc) +} + +src_install() { + dodir /opt/openfire + + doinitd "${FILESDIR}"/openfire-initd + doconfd "${FILESDIR}"/openfire-confd + + dodir /opt/openfire/conf + insinto /opt/openfire/conf + newins target/openfire/conf/openfire.xml openfire.xml.sample + + dodir /opt/openfire/logs + keepdir /opt/openfire/logs + + dodir /opt/openfire/lib + insinto /opt/openfire/lib + doins target/openfire/lib/* + + dodir /opt/openfire/plugins + insinto /opt/openfire/plugins + doins -r target/openfire/plugins/* + + dodir /opt/openfire/resources + insinto /opt/openfire/resources + doins -r target/openfire/resources/* + + if use doc; then + dohtml -r documentation/docs/* + fi + dodoc documentation/dist/* + + #Protect ssl key on upgrade + dodir /etc/env.d/ + echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire +} + +pkg_postinst() { + chown -R jabber:jabber /opt/openfire + + ewarn If this is a new install, please edit /opt/openfire/conf/openfire.xml.sample + ewarn and save it as /opt/openfire/conf/openfire.xml + ewarn + ewarn The following must be be owned or writable by the jabber user. + ewarn /opt/openfire/conf/openfire.xml + ewarn + ewarn If you are upgrading please have a look at the Wildfire to Openfire Upgrade Guide: + ewarn http://wiki.igniterealtime.org/display/WILDFIRE/Wildfire+to+Openfire+Upgrade+Guide + ewarn +}