[gentoo-commits] proj/lua:master commit in: net-im/prosody-modules/, net-im/prosody/

[gentoo-commits] proj/lua:master commit in: net-im/prosody-modules/, net-im/prosody/

[Misbakh-Soloviev Vadim A.]

commit:     dcba41c60ae3183c9c917792626dbcea62d27e55
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sun Aug  5 01:51:56 2012 +0000
Commit:     Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Sun Aug  5 02:04:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=dcba41c6

net-im/prosody-modules: some new modules

---
 net-im/prosody-modules/prosody-modules-9999.ebuild |   25 +++++++------
 net-im/prosody/prosody-9999.ebuild                 |   39 +++++++++++++-------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/net-im/prosody-modules/prosody-modules-9999.ebuild b/net-im/prosody-modules/prosody-modules-9999.ebuild
index 2d6b57f..3dabf10 100644
--- a/net-im/prosody-modules/prosody-modules-9999.ebuild
+++ b/net-im/prosody-modules/prosody-modules-9999.ebuild
@@ -16,18 +16,19 @@ KEYWORDS=""
 PROSODY_MODULES="
 	addressing admin_web archive archive_muc auth_dovecot auth_external
 	auth_internal_yubikey auth_joomla auth_ldap auth_phpbb3 auth_sql auth_wordpress
-	auto_accept_subscriptions blocking c2s_conn_throttle carbons checkcerts
-	client_certs compat_bind compat_muc_admin compat_vcard component_roundrobin
-	conformance_restricted couchdb data_access default_bookmarks default_vcard
-	discoitems extdisco flash_policy group_bookmarks host_guard http_favicon
-	inotify_reload ipcheck json_streams lastlog latex limits log_auth mam mam_adhoc
-	motd_sequential muc_intercom muc_limits muc_log muc_log_http offline_email onhold
-	openid pastebin post_msg pubsub_feeds pubsub_hub readonly register_json register_redirect
-	register_web reload_modules remote_roster roster_command s2s_idle_timeout
-	s2s_never_encrypt_blacklist s2s_reload_newcomponent saslauth_muc seclabels server_contact_info
-	server_status service_directories sift smacks sms_clickatell srvinjection stanza_counter
-	storage_mongodb streamstats support_contact swedishchef tcpproxy throttle_presence twitter
-	vjud webpresence websocket
+	auto_accept_subscriptions blocking block_s2s_subscriptions block_strangers
+	block_subscriptions c2s_conn_throttle carbons checkcerts client_certs compat_bind
+	compat_muc_admin compat_vcard component_roundrobin conformance_restricted couchdb
+	data_access default_bookmarks default_vcard discoitems extdisco flash_policy
+	group_bookmarks host_guard http_favicon inotify_reload ipcheck json_streams
+	lastlog latex limits log_auth mam mam_adhoc motd_sequential muc_intercom muc_limits
+	muc_log muc_log_http offline_email onhold openid pastebin post_msg pubsub_feeds
+	pubsub_hub readonly register_json register_redirect register_web reload_modules
+	remote_roster roster_command s2s_idle_timeout s2s_never_encrypt_blacklist
+	s2s_reload_newcomponent saslauth_muc seclabels server_contact_info server_status
+	service_directories sift smacks sms_clickatell srvinjection stanza_counter
+	storage_mongodb streamstats support_contact swedishchef tcpproxy throttle_presence
+	twitter vjud webpresence websocket
 "
 
 

diff --git a/net-im/prosody/prosody-9999.ebuild b/net-im/prosody/prosody-9999.ebuild
index 2d69e36..ac0749c 100644
--- a/net-im/prosody/prosody-9999.ebuild
+++ b/net-im/prosody/prosody-9999.ebuild
@@ -14,7 +14,7 @@ EHG_REPO_URI="http://hg.prosody.im/trunk"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libevent mysql postgres sqlite +ssl +zlib +luajit ipv6"
+IUSE="+libevent mysql postgres sqlite +ssl +zlib +luajit ipv6 migration"
 
 DEPEND="	virtual/lua
 		net-im/jabber-base
@@ -50,26 +50,41 @@ src_prepare() {
 }
 
 src_configure() {
-	# LuaJIT configuration feature (pkg-config is not in deps, since it is LuaJIT there)
-	# and LuaJIT has pkg-config in deps ;)
-	use luajit && myconf="--with-lua-include=$(pkg-config --variable includedir luajit)"
+	use luajit && \
+		myconf="--with-lua-include=$(pkg-config --variable includedir luajit)" || \
+		myconf="--with-lua-include=$(pkg-config --variable includedir lua)"
 	# the configure script is handcrafted (and yells at unknown options)
 	# hence do not use 'econf'
 	./configure --prefix="/usr" \
+		--ostype=linux \
 		--sysconfdir="${JABBER_ETC}" \
 		--datadir="${JABBER_SPOOL}" \
-		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--with-lua-lib=/usr/$(get_libdir) \
 		--c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \
 		--cflags="${CFLAGS} -Wall -fPIC" \
 		--ldflags="${LDFLAGS} -shared" \
 		--require-config "${myconf}" || die "configure failed"
 }
 
+src_compile() {
+	default
+	use migration && (
+		cd "${S}/tools/migration"
+		emake || die "emake migrator fails"
+	)
+}
+
 src_install() {
 	DESTDIR="${D}" emake install || die "make failed"
 	newinitd "${FILESDIR}/${PN}".initd "${PN}"
-	insinto "/usr/$(get_libdir)/${PN}"
-	doins -r tools
+	use migration && (
+		cd "${S}/tools"
+		insinto $(pkg-config lua --variable INSTALL_LMOD)
+		doins erlparse.lua
+		newbin ejabberd2prosody{.lua,}
+		newbin ejabberdsql2prosody{.lua,}
+		newbin xep227toprosody{.lua,}
+	)
 }
 
 src_test() {
@@ -77,9 +92,7 @@ src_test() {
 	./run_tests.sh
 }
 
-pkg_postinst() {
-	einfo ""
-	einfo "If you want to migrate your data from another XMPP-server"
-	einfo "software, please take a look into /usr/$(get_libdir)/${PN}/tools"
-	einfo ""
-}
+#pkg_postinst() {
+#	einfo ""
+#	einfo ""
+#}