Add www-apps/nabaztaglives-2.1.7, update www-apps/nabaztaglives-2.1.2

3 files changed, 149 insertions, 4 deletions

diff --git a/www-apps/nabaztaglives/Manifest b/www-apps/nabaztaglives/Manifest
index 8832a312..7eae30a1 100644
--- a/www-apps/nabaztaglives/Manifest
+++ b/www-apps/nabaztaglives/Manifest
@@ -7,8 +7,10 @@ AUX postinstall-en-2.00.txt 300 SHA256 c54ee8192d3aed8a0f90dc5f9805e42e237e1d479
 DIST nabaztaglives-code-258dd0c4c32207863fb4657a453d507876ca2c5a.zip 32143186 SHA256 f299562289bade6779539f929413cec8f30205cd4a133f4bfd964a6cadb938fb SHA512 5ae0d1fdb6b82eb9a0c22b7a9986ddf4e28cab9571f0ba652d52de499e4003a2eba7220d0e91f3d9fc009a8809ea4257eb12d5d66fc3fab1b6edced67a28d032 WHIRLPOOL 50daf7acac1444f7960830bdf348b8a64cb6efd124882332bfaae42d4f45c515351dc3d303283bd32f10aad9d0eb19013df4c6962571c636df2ee8618c34285c
 DIST nabaztaglives-code-5577e0e24dcf95179d078ddc04753a83b1e43b0a.zip 31649978 SHA256 72ae80194e5522fce4732302d41a580262947fdc55dcc52bcfa2d7f5b6de10a8 SHA512 9b3ba8bb8af32a48529af796fca25a70cb607413a32a877e33a157829dcb5540f8b9e47de4d8725f6bd4ad6af9661503aef8d45661cfe7b675d72999ce269f8b WHIRLPOOL 195c3de2dc7c55ea005bc03f5b66a1d258b69dbccb3911e27c3487128588e998e55d5dadfaac72fd8e0b2911c518aa23a65ffd387000b0c359a5706d12eb15f6
 DIST nabaztaglives-code-74cd772d67aaad1accbb58382e16cfaaa5ac6d87.zip 31650624 SHA256 08284563d747154b61036cd4a4172a4b3999ffffa6413b7a4e73628b70c3e07d SHA512 227a3544b3df4394da3d748355756fb4f27bdb140b80840e1b1ffd93da1c2d8d5e57ffaf50d7970a340fc2000377c90f8d207efffcc848319f09792621f66efc WHIRLPOOL e24b423b06b0dc302e596031714a5c210c1783898235664753a8272c8bcd3c8ee209927a7bb690627c56dcb353e4abd9387910573f552de99d607887cbc2c5b0
+DIST nabaztaglives-code-bed1196b9d387ddbaaabf64170e734fbb6815b91.zip 32146378 SHA256 03d07946eb0af3ef60b43b77d8dbc693290720a597671f545b57374125d449f1 SHA512 464a4477bf4af5ca8410d34bc2711272e10c7f53ff5c75c67b18d0446da26d09bc51ba543923750110e89f485fbf96765eb434a8c0e775efe08b7821051cefea WHIRLPOOL 2e6c5ed4f9c4fbe75d55a1f32e10eb1544d5855fe99a5a46d3d6f696084750cc12e1cea6faa63c0dfee2f0dd24d1bbe2bbaa4fa8b6d3875668eeb84e10b81029
 DIST nabaztaglives-code-d3a30896c132760bef5f6823efa3b3bb8d0c9f3d.zip 31565931 SHA256 79d3b34adbf2cbb02959fd9d224a99e6d975ec1d60cecd297b9db9e62954fb20 SHA512 951fa50d8efabd0e981b0a03d42d1de9d69d3fc117795fdb8f5d092abbd26c778d21c296fcb2980efeba46894df433a0e711731ab0519fb9a18f4116e3767423 WHIRLPOOL 0f5580c67e925b82e8e2e65e888eb0fede7f293f6eab6004305995fbfbeb9eaa9bb9f22d327c51df0b2afbd26aaf69462fae6f618488b6a692eceec2e9116aa9
 EBUILD nabaztaglives-2.00.ebuild 3149 SHA256 ac9e3803d30d2823ff50ee2667ba68408abe320c8b0f89e877e156783d89ba67 SHA512 98092111317cd4db0b401d5254a0a5f125e367e09cf297f6ec3b64413b35be34cdb40b218bc10a57ca2681521758e0d7a2f31db13be9a1cfc44311c68cf8ec20 WHIRLPOOL 9a5f5f21808493a96c92a3e9484c2e48e0f397ca2bbaac3f1c5499414b664833c9956c2b6349e19bde98ac801eefaf4564508c523916b8249a6cae5aa6cae4d2
 EBUILD nabaztaglives-2.01.ebuild 3148 SHA256 120e1215a875358fbfffca4473176d7fcf90f31070b7a71f018f5f61c0cb489c SHA512 21a0f15b016f4c0b28297b36b01b87175635b1e6bd6e475ab0d489067b9d554e15602441a462e53d3db0209d5ce9caea71d5cc43fcf76c2cd76d60dc94e157ac WHIRLPOOL 6a5f5bd9c562d62ffaa847026c1a3bface2a2255d11debf283172fbe92d5fab72ca54d1438eb281f7d21ee0e8751aa3789909157b6d2f3ffdeb7157d860577ff
 EBUILD nabaztaglives-2.03.ebuild 3161 SHA256 e98b76cd10de54ab99b8c473ae1a4b64db70db635b198a18c9f0ec1b7986b292 SHA512 e2cd2f6dfc999eb961392acbe66bffdbd0f57345004c33e00e143a34c7cb7dc9957a3f67d255157c1e2df39d35e64c6d05bcf25eccafa57868075a5b2911b5e8 WHIRLPOOL 4c3a95ed33747af8a37dae7f493c05bccc5caeb9669d4117c21e5e296476dec74b0452630a1037bca05fa40b3d154710bce2123a64826ceefb328f417bd24c2b
-EBUILD nabaztaglives-2.1.2.ebuild 3669 SHA256 d7929606ef5131da94d130d42703a7b41286b9c43fc040ee5028787f83053e40 SHA512 a007c61458c20a93fb35f45723459945322173edb6c48ff536504fcbfe6e3e02fc639978368c02fe1a0e35c30f080ecfe259500b4c04e53e3a938c554b9572b0 WHIRLPOOL 65811264cc866e18a4fa5c9df7d96ebb133e4fde242a298f6c3c11f183853b4556f89c1a058484ea3fea48af02fdc61dc2ed7d5b496b4b83ae3405c5cf7b391b
+EBUILD nabaztaglives-2.1.2.ebuild 3652 SHA256 78920b15c7be7216bad560256e82028c38fcccac965d8e693bf0b979094c087a SHA512 a5e85b7a6cb6467bbf2b588a676979ddce09682fd909d7021e2aa274ecf83ccd2eb6f125be5c707075da64f5fc095a697bc745a3152c29fdb65dd35c0fc62d5f WHIRLPOOL 15e9f79a06393a41d015e6d5ce4934c96de93aa6aabc9016a061323170d42e6866088dbff3158af9e949dbe62bbe05cb7d51b03111398e26e2176bda4754e03d
+EBUILD nabaztaglives-2.1.7.ebuild 3941 SHA256 3549eba90b627244c305717eb183d86303a4748e689a1cfbdb4467900dd1de3d SHA512 b8c6a77b1ddac43357618cf7bee26e0612f75a237592e1d3d0cc4e4b7e9de3a759d3df8671cbc6e7f6b060d936595e61cffc1a1d9d40bd6f25aa6bdde0d26714 WHIRLPOOL 15108429bd485a220748f296a656b5a68d52a89f58660fcfd73683cb889090a2f84a997a42cd757080a0c81a6cee5dcfd62b16f22d9033e4ab74767699da6481
diff --git a/www-apps/nabaztaglives/nabaztaglives-2.1.2.ebuild b/www-apps/nabaztaglives/nabaztaglives-2.1.2.ebuild
index b940b025..fd4506ba 100644
--- a/www-apps/nabaztaglives/nabaztaglives-2.1.2.ebuild
+++ b/www-apps/nabaztaglives/nabaztaglives-2.1.2.ebuild
@@ -30,7 +30,7 @@ need_httpd_cgi
 
 S="${WORKDIR}/nabaztaglives-code-${COMMIT}"
 
-pkg_setup() {
+pkg_nofetch() {
 	einfo "If the source for this ebuild fails to download, please access the following URL:"
 	einfo
 	einfo "  https://sourceforge.net/p/nabaztaglives/code/ci/258dd0c4c32207863fb4657a453d507876ca2c5a/tree/"
@@ -38,8 +38,6 @@ pkg_setup() {
 	einfo "... and select 'Download Snapshot' in order to regenerate the cached archive."
 	einfo
 	einfo "This is (one of the many reasons) why everyone is using github instead..."
-
-	webapp_pkg_setup
 }
 
 src_prepare() {
diff --git a/www-apps/nabaztaglives/nabaztaglives-2.1.7.ebuild b/www-apps/nabaztaglives/nabaztaglives-2.1.7.ebuild
new file mode 100644
index 00000000..6b46460c
--- /dev/null
+++ b/www-apps/nabaztaglives/nabaztaglives-2.1.7.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils webapp
+
+LANGUAGES="l10n_de l10n_en l10n_es l10n_fr l10n_it l10n_ja l10n_us"
+
+COMMIT="bed1196b9d387ddbaaabf64170e734fbb6815b91"
+
+DESCRIPTION="Nabaztag/tag NabaztagLives! Server"
+HOMEPAGE="http://nabaztaglives.com"
+SRC_URI="http://sourceforge.net/code-snapshots/git/n/na/nabaztaglives/code.git/nabaztaglives-code-${COMMIT}.zip"
+RESTRICT="nomirror"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ${LANGUAGES}"
+
+RDEPEND="
+	virtual/httpd-php
+	dev-lang/php
+	media-sound/lame
+	media-sound/mp3wrap
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/nabaztaglives-code-${COMMIT}"
+
+pkg_nofetch() {
+	einfo "If the source for this ebuild fails to download, please access the following URL:"
+	einfo
+	einfo "  https://sourceforge.net/p/nabaztaglives/code/ci/${COMMIT}/tree/"
+	einfo
+	einfo "... and select 'Download Snapshot' in order to regenerate the cached archive."
+	einfo
+	einfo "This is (one of the many reasons) why everyone is using github instead..."
+}
+
+src_prepare() {
+	cd "${S}"
+
+	if use l10n_ja; then
+		epatch "${FILESDIR}"/"${PN}"-2.1-lang-ja.patch
+	fi
+
+	sed -si \
+		-e 's|<? |<?php |g' \
+		www/*.php \
+	|| die "PHP patching failed: ${?}"
+
+	sed -si \
+		-e "s|'../etc/nabaztag_error.log'|'logs/error.log'|" \
+		www/*.php www/subroutines/logError.php \
+	|| die "Log-location patching failed: ${?}"
+	sed -si \
+		-e 's|../etc/nabaztag_error.log|logs/error.log|' \
+		www/vl/p4.php www/vl/FR/p3.jsp \
+	|| die "Log-location patching failed: ${?}"
+
+	sed -si \
+		-e "s|../etc/api_calls.log|logs/apicalls.log|" \
+		www/*.php \
+	|| die "API log-location patching failed: ${?}"
+
+	sed -si \
+		-e 's|../etc/nabaztag_db.php|config/db.php|' \
+		www/*.php www/subroutines/*.php www/vl/p4.php www/vl/FR/p3.jsp \
+	|| die "Configuration patching failed: ${?}"
+
+	sed -rsi \
+		-e 's|<img src="?([^"> ]+).jpg"?|<img src="images/\1.jpg"|g' \
+		www/*.php www/*.htm \
+	|| die "Image patching failed: ${?}"
+	sed -rsi \
+		-e 's|<a href="?([^"> ]+).jpg"?|<a href="images/\1.jpg"|g' \
+		www/*.php \
+	|| die "Image patching failed: ${?}"
+
+	sed -rsi \
+		-e 's|url\(([^)]+).jpg\)|url(images/\1.jpg)|g' \
+		www/main.css \
+	|| die "CSS Image patching failed: ${?}"
+
+	sed -si \
+		-e "/'pi'/d" \
+		db/rabbit_pi.sql \
+	|| die "MySQL script patching failed: ${?}"
+
+	#use l10n_en || { einfo "Removing audio files for EN/US language" ; rm -r www/vl/broad_us ; }
+	for LNG in it es de us; do
+		eval "use l10n_${LNG} || { einfo 'Removing audio files for ${LNG} language' ; rm -r www/vl/broad_${LNG} ; }"
+	done
+
+	mkdir www/images
+
+	rm db/*.sh
+	rm docs/installation.htm
+
+	mv www/*.jpg www/images/
+	mv db/rabbit_pi.sql db/initial.sql
+
+	epatch "${FILESDIR}/${PN}-2.1.2-api.patch" || die "Patch failed"
+	epatch "${FILESDIR}/${PN}-2.00.patch" || die "Patch failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	use doc && dohtml -r docs/*
+
+	ewarn "Installation of large numbers of files can be slow - please wait ..."
+	insinto "${MY_HTDOCSDIR}"
+	doins -r www/*
+	dodir "${MY_HTDOCSDIR}"/db
+	dodir "${MY_HTDOCSDIR}"/config
+	dodir "${MY_HTDOCSDIR}"/logs
+	insinto "${MY_HTDOCSDIR}"/db
+	doins -r db/*
+	insinto "${MY_HTDOCSDIR}"/config
+	newins etc/nabaztag_db.php db.php
+	insinto "${MY_HTDOCSDIR}"/logs
+	newins etc/nabaztag_error.log error.log
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/vl/hutch
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs/error.log
+	webapp_configfile  "${MY_HTDOCSDIR}"/config/db.php
+	webapp_configfile  "${MY_HTDOCSDIR}"/locate.jsp
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.00.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "As of 12th December 2016:"
+	elog
+	elog "It seems that Acapella has caught on to us and they've told us that they"
+	elog "don't like rabbits,  especially ones that speak, so I'm currently testing"
+	elog "out a new TTS engine. In the meantime, you may want to disable your TTS feed on"
+	elog "your rabbit setup page."
+}