From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:13:10 +0100 Subject: Revert "gentoo resync : 02.06.2018" This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec. --- net-im/Manifest.gz | Bin 8742 -> 8736 bytes net-im/prosody/Manifest | 8 +-- net-im/prosody/prosody-0.10.0-r1.ebuild | 83 ++++++++++++++++++++++++++++++++ net-im/prosody/prosody-0.10.2.ebuild | 83 -------------------------------- net-im/prosody/prosody-0.9.10.ebuild | 83 ++++++++++++++++++++++++++++++++ net-im/prosody/prosody-0.9.14.ebuild | 83 -------------------------------- 6 files changed, 170 insertions(+), 170 deletions(-) create mode 100644 net-im/prosody/prosody-0.10.0-r1.ebuild delete mode 100644 net-im/prosody/prosody-0.10.2.ebuild create mode 100644 net-im/prosody/prosody-0.9.10.ebuild delete mode 100644 net-im/prosody/prosody-0.9.14.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 14f45e192d8e..6a32d351e818 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index faa327a7b0e2..ff7bfbf9f6c0 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -3,12 +3,12 @@ AUX prosody-0.9.2-cfg.lua.patch 2173 BLAKE2B 7b2fbfb1fa6c57b34e96f54cc6c50449057 AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfeee09c939a2c9449a7f5994d984ed68ffbd015344db8f99fc9e5f5a16c4196d767c1768140d4880becc SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc -DIST prosody-0.10.2.tar.gz 331874 BLAKE2B 0e0af95a9168810263e6f60b825393d1088f69dba1faabf6c0c9dda3ef6b039a92f7edb9643cb9a60a3131a64038de5c3598f7076837b58ad196ac03fa98bfc4 SHA512 9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f +DIST prosody-0.10.0.tar.gz 330461 BLAKE2B f1efc1750177253937fae122f5bcc3d928db8bef756d2cd92a0819bdf4ea68fb3c8c94b63d9ac058af38541993f99d3eb4c80dc84bbb2badf067507986d62b20 SHA512 ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9 +DIST prosody-0.9.10.tar.gz 267380 BLAKE2B 091f9f7ffa5abdd93eaa87652653516cd1fa662f9300b8095f15685fc51c71cebb67a13d9a59b5ce00292777baf56926f08c3b6cf264836007db6a2dbf3ef068 SHA512 4453fb596704b6a248a52dedc00cfc77edbee1fad502f1197b04c2148092389a294c152c3ba36203f51831d51ee2b915c15382ac86fcff4f35696ecacf926574 DIST prosody-0.9.11.tar.gz 267832 BLAKE2B f5992c7b34f02557338fec9f8c11c19dc5f31aaee326a33834fc28e06fd4bc41bb46cc79e6c7f206f34a074a52448cfdd98045ab49cf4188a93162cfc16da1ca SHA512 9de11e130f88d1f9a830a4cd9ad90c0176d97977c81fd7a4405ce735f12d23eaa0bb0f124ce406102c2d072247133bddf371256d696e806cac9ef4bf0821684f DIST prosody-0.9.12.tar.gz 267869 BLAKE2B dff18a9fdf795afa2b6e5c6695bc1bbe64398351b6e600a85b4ca6d4ab5c866e897cacd0cb2ac4425ad7ccc630604fd7089d05a3cbb041262d84cd7027c9e8a9 SHA512 e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 -DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3 -EBUILD prosody-0.10.2.ebuild 2484 BLAKE2B 39490d068e3554d75d8651258c8cee1307f419bd3b3b2f1f597bd9ef3adf0a59c879818d91e4652ce43c19a3c3e391339711409b5b58af748025004db8dfa39a SHA512 45bc465b096e0f2083c3b36faa3ddcabfa65b100014abc020efb8d81e7939be7d52c9d80defe58bcc51139021dfd8ed1205a8d0a0d82b641ed8b870ea0236505 +EBUILD prosody-0.10.0-r1.ebuild 2484 BLAKE2B b963b06d6c8a3a338253998552c03d3f7f363f2b5df7423ede3854eff04b575bdefd127aa3d86c66012f69cb3a84e09f4a10d20b47062ad727a07b10b87821a2 SHA512 6f527e312dfa4ff3332ce418fec50a3a40d8bfb0c72808bbc48d0251f203cc17b73f737fef8ca169e3b79c6ca2282818b985225797cfaecb66786869e752d6e6 +EBUILD prosody-0.9.10.ebuild 2487 BLAKE2B 6bc014160c940a133bef2a3405759866fe1382cc64683dd3db4a6471accceea91e2e3d8c9ef243bb60be0afcdad804c80406fcdbc38d0c67c40fbca45033aea2 SHA512 cd6822c142e94ab192631c5f818cbc00595d4ca2a9b7fb7d37edd5f4a943f4d2c8809879191540d2eb6b55406fa042d5f89bff9f830a0ab21776f6448dab14b7 EBUILD prosody-0.9.11.ebuild 2482 BLAKE2B 71683b6194e6921a129a4a18901685c03f5e9ffbc8d7cc532621bc87503762efff6561d2ea2d7bde636a5432cfae18a0d6a85b642650af9ab065c963d563c2be SHA512 c2cf0947fd2119f7266b7fdc60a9596704083f4d61ab6b1d316605e87016f02e03627b8281c1a42172462f6a9f716ab6a8a19ed8c20d7d0500683fb5146bb003 EBUILD prosody-0.9.12.ebuild 2482 BLAKE2B 58f0a66e6291ea1bb82048c7bf34c184beaaae5dfc0000de3ffb705bc99a0e376e9a1e8d0501958748aa79f407326d48c65da488a8824395493ae9862a0c93e8 SHA512 8eafff7f0e472ddc9aca7f3bfd572cfab1544a7e3380f7d9a23f1b76ad4966b73cedc3571dbddbf2f85a5fca3c1b737ceb6ef3c4e00c1b2246d165bda09f88d4 -EBUILD prosody-0.9.14.ebuild 2490 BLAKE2B db50b64ee2ddc2e3f7475243f9d1569e9a43749e05f3b26e4265775fab69dea588e2e6269b34625dced8fb8fc6500343002c653d0bd6832e23dbd44854e67dec SHA512 37c8fd84dd91167de9a65b1b5ac243b5b675a5573734e239d1b704edf99ca200eedf27e5eb6fdcb263e3cbcf2557179af31134ab47e5d564195100b3c3339a69 MISC metadata.xml 624 BLAKE2B 57704d2f82f7b7daa34d7114d375591cffe12a3cfd396a95ea61c76f644750cd92567d5619133bebd56ff2f302c3f576aca22abcc954641c89757e85e35ae0b6 SHA512 0410e3372d04163cc8b5e03d95f5c0c7e7e6da4e6034adfd86700455c6662d844e8da5590dbd5a633179dd8c3da15760b49d3068787ed61833c9031cec341a24 diff --git a/net-im/prosody/prosody-0.10.0-r1.ebuild b/net-im/prosody/prosody-0.10.0-r1.ebuild new file mode 100644 index 000000000000..d93d0e7b645a --- /dev/null +++ b/net-im/prosody/prosody-0.10.0-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit flag-o-matic multilib systemd versionator + +MY_PV=$(replace_version_separator 3 '') +MY_P="${PN}-${MY_PV}" +DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" +HOMEPAGE="http://prosody.im/" +SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl" + +DEPEND="net-im/jabber-base + dev-lua/LuaBitOp + !jit? ( >=dev-lang/lua-5.1:0 ) + jit? ( dev-lang/luajit:2 ) + >=net-dns/libidn-1.1 + !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" +RDEPEND="${DEPEND} + >=dev-lua/luaexpat-1.3.0 + dev-lua/luafilesystem + ipv6? ( >=dev-lua/luasocket-3 ) + !ipv6? ( dev-lua/luasocket ) + libevent? ( >=dev-lua/luaevent-0.4.3 ) + mysql? ( dev-lua/luadbi[mysql] ) + postgres? ( dev-lua/luadbi[postgres] ) + sqlite? ( dev-lua/luadbi[sqlite] ) + ssl? ( dev-lua/luasec ) + zlib? ( dev-lua/lua-zlib )" + +S=${WORKDIR}/${MY_P} + +JABBER_ETC="/etc/jabber" +JABBER_SPOOL="/var/spool/jabber" + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.10.0-cfg.lua.patch" + sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ + -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ + -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\ + -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\ + Makefile || die +} + +src_configure() { + # the configure script is handcrafted (and yells at unknown options) + # hence do not use 'econf' + append-cflags -D_GNU_SOURCE + luajit="" + if use jit; then + luajit="--runwith=luajit" + fi + ./configure \ + --ostype=linux $luajit \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/lib64" \ + --sysconfdir="${JABBER_ETC}" \ + --datadir="${JABBER_SPOOL}" \ + --with-lua-include=/usr/include \ + --with-lua-lib=/usr/$(get_libdir)/lua \ + --cflags="${CFLAGS} -Wall -fPIC" \ + --ldflags="${LDFLAGS} -shared" \ + --c-compiler="$(tc-getCC)" \ + --linker="$(tc-getCC)" || die "configure failed" +} + +src_install() { + emake DESTDIR="${D}" install + systemd_dounit "${FILESDIR}/${PN}".service + systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf + newinitd "${FILESDIR}/${PN}".initd-r2 ${PN} +} + +src_test() { + cd tests || die + ./run_tests.sh || die +} diff --git a/net-im/prosody/prosody-0.10.2.ebuild b/net-im/prosody/prosody-0.10.2.ebuild deleted file mode 100644 index de5ae8dcbe8e..000000000000 --- a/net-im/prosody/prosody-0.10.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic multilib systemd versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" -HOMEPAGE="http://prosody.im/" -SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl" - -DEPEND="net-im/jabber-base - dev-lua/LuaBitOp - !jit? ( >=dev-lang/lua-5.1:0 ) - jit? ( dev-lang/luajit:2 ) - >=net-dns/libidn-1.1 - !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" -RDEPEND="${DEPEND} - >=dev-lua/luaexpat-1.3.0 - dev-lua/luafilesystem - ipv6? ( >=dev-lua/luasocket-3 ) - !ipv6? ( dev-lua/luasocket ) - libevent? ( >=dev-lua/luaevent-0.4.3 ) - mysql? ( dev-lua/luadbi[mysql] ) - postgres? ( dev-lua/luadbi[postgres] ) - sqlite? ( dev-lua/luadbi[sqlite] ) - ssl? ( dev-lua/luasec ) - zlib? ( dev-lua/lua-zlib )" - -S=${WORKDIR}/${MY_P} - -JABBER_ETC="/etc/jabber" -JABBER_SPOOL="/var/spool/jabber" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.10.0-cfg.lua.patch" - sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ - -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ - -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\ - -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\ - Makefile || die -} - -src_configure() { - # the configure script is handcrafted (and yells at unknown options) - # hence do not use 'econf' - append-cflags -D_GNU_SOURCE - luajit="" - if use jit; then - luajit="--runwith=luajit" - fi - ./configure \ - --ostype=linux $luajit \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/lib64" \ - --sysconfdir="${JABBER_ETC}" \ - --datadir="${JABBER_SPOOL}" \ - --with-lua-include=/usr/include \ - --with-lua-lib=/usr/$(get_libdir)/lua \ - --cflags="${CFLAGS} -Wall -fPIC" \ - --ldflags="${LDFLAGS} -shared" \ - --c-compiler="$(tc-getCC)" \ - --linker="$(tc-getCC)" || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install - systemd_dounit "${FILESDIR}/${PN}".service - systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf - newinitd "${FILESDIR}/${PN}".initd-r2 ${PN} -} - -src_test() { - cd tests || die - ./run_tests.sh || die -} diff --git a/net-im/prosody/prosody-0.9.10.ebuild b/net-im/prosody/prosody-0.9.10.ebuild new file mode 100644 index 000000000000..f6dde4ed98c7 --- /dev/null +++ b/net-im/prosody/prosody-0.9.10.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit flag-o-matic multilib systemd versionator + +MY_PV=$(replace_version_separator 3 '') +MY_P="${PN}-${MY_PV}" +DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" +HOMEPAGE="http://prosody.im/" +SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl" + +DEPEND="net-im/jabber-base + !jit? ( >=dev-lang/lua-5.1:0 ) + jit? ( dev-lang/luajit:2 ) + >=net-dns/libidn-1.1 + !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" +RDEPEND="${DEPEND} + >=dev-lua/luaexpat-1.3.0 + dev-lua/luafilesystem + ipv6? ( >=dev-lua/luasocket-3 ) + !ipv6? ( dev-lua/luasocket ) + libevent? ( >=dev-lua/luaevent-0.4.3 ) + mysql? ( dev-lua/luadbi[mysql] ) + postgres? ( dev-lua/luadbi[postgres] ) + sqlite? ( dev-lua/luadbi[sqlite] ) + ssl? (