[gentoo-commits] gentoo-x86 commit in www-apps/twiki: metadata.xml twiki-4.1.2.ebuild ChangeLog twiki-4.2.0.ebuild

[Benedikt Boehm (hollow)]

hollow      08/02/24 00:00:39

  Modified:             metadata.xml twiki-4.1.2.ebuild ChangeLog
  Added:                twiki-4.2.0.ebuild
  Log:
  version bump, #209663; ebuild cleanup wrt #208584
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  www-apps/twiki/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/twiki/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	15 Aug 2004 15:49:56 -0000	1.1
+++ metadata.xml	24 Feb 2008 00:00:38 -0000	1.2
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@g.o</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+	<herd>web-apps</herd>
 </pkgmetadata>



1.2                  www-apps/twiki/twiki-4.1.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild?r1=1.1&r2=1.2

Index: twiki-4.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twiki-4.1.2.ebuild	26 May 2007 21:48:05 -0000	1.1
+++ twiki-4.1.2.ebuild	24 Feb 2008 00:00:38 -0000	1.2
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.1 2007/05/26 21:48:05 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.2 2008/02/24 00:00:38 hollow Exp $
 
-inherit webapp eutils depend.apache
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit webapp
 
 MY_PN="TWiki"
 
@@ -14,56 +16,50 @@
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
-RDEPEND=">=dev-lang/perl-5.8
-		>=app-text/rcs-5.7
-		sys-apps/diffutils
-		dev-perl/Algorithm-Diff
-		>=virtual/perl-CGI-3.20
-		virtual/perl-File-Spec
-		dev-perl/Text-Diff
-		virtual/perl-Time-Local
-		dev-perl/CGI-Session
-		virtual/perl-digest-base
-		dev-perl/Digest-SHA1
-		dev-perl/locale-maketext-lexicon
-		virtual/perl-libnet
-		dev-perl/URI
-		virtual/cron
-		dev-perl/HTML-Parser
-"
-
-want_apache
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv ${S}/bin/LocalLib.cfg.txt ${S}/bin/LocalLib.cfg
-	# change web user to apache
-	cd ${S}/lib/TWiki
-	find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';'
-}
+RDEPEND=">=app-text/rcs-5.7
+	sys-apps/diffutils
+	>=dev-lang/perl-5.8
+	dev-perl/Algorithm-Diff
+	dev-perl/CGI-Session
+	dev-perl/Digest-SHA1
+	dev-perl/HTML-Parser
+	dev-perl/locale-maketext-lexicon
+	dev-perl/Text-Diff
+	dev-perl/URI
+	virtual/cron
+	>=virtual/perl-CGI-3.20
+	virtual/perl-digest-base
+	virtual/perl-File-Spec
+	virtual/perl-libnet
+	virtual/perl-Time-Local"
+
+need_httpd_cgi
 
 src_install() {
 	webapp_src_preinst
 
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	dodoc readme.txt
+	dodoc AUTHORS COPYRIGHT readme.txt
 	dohtml T*.html INSTALL.html
+	rm -f readme.txt T*.html INSTALL.html
 
-	for file in $(find data pub) ; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	mv bin/LocalLib.cfg{.txt,}
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	for f in $(find data pub); do
+		webapp_serverowned "${MY_HTDOCSDIR}"/${f}
 	done
 
-	for a in bin/setlib.cfg bin/LocalLib.cfg ; do
-		webapp_configfile ${MY_HTDOCSDIR}/${a}
+	for f in bin/setlib.cfg bin/LocalLib.cfg; do
+		webapp_configfile "${MY_HTDOCSDIR}"/${f}
 	done
-	webapp_hook_script ${FILESDIR}/reconfig
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
 
 	webapp_src_install
 }
@@ -76,8 +72,5 @@
 	ewarn "You are _strongly_ encouraged to to read the upgrade guide:"
 	ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation"
 	ewarn
-	elog "webapp-config will not be run automatically"
-	elog "Run webapp-config -I -h <host> -d ${PN} ${PN} ${PVR} to install"
-	elog
-	# webapp_pkg_postinst
+	webapp_pkg_postinst
 }



1.43                 www-apps/twiki/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	26 May 2007 21:48:05 -0000	1.42
+++ ChangeLog	24 Feb 2008 00:00:38 -0000	1.43
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/twiki
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.42 2007/05/26 21:48:05 rl03 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.43 2008/02/24 00:00:38 hollow Exp $
+
+*twiki-4.2.0 (24 Feb 2008)
+
+  24 Feb 2008; Benedikt Böhm <hollow@g.o> metadata.xml,
+  twiki-4.1.2.ebuild, +twiki-4.2.0.ebuild:
+  version bump, #209663; ebuild cleanup wrt #208584
 
 *twiki-4.1.2 (26 May 2007)
 



1.1                  www-apps/twiki/twiki-4.2.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild?rev=1.1&content-type=text/plain

Index: twiki-4.2.0.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild,v 1.1 2008/02/24 00:00:38 hollow Exp $

WEBAPP_NO_AUTO_INSTALL="yes"

inherit webapp

MY_PN="TWiki"

DESCRIPTION="A Web Based Collaboration Platform"
HOMEPAGE="http://twiki.org/"
SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz"

LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""

S="${WORKDIR}"

RDEPEND=">=app-text/rcs-5.7
	sys-apps/diffutils
	>=dev-lang/perl-5.8
	dev-perl/Algorithm-Diff
	dev-perl/CGI-Session
	dev-perl/Digest-SHA1
	dev-perl/HTML-Parser
	dev-perl/locale-maketext-lexicon
	dev-perl/Text-Diff
	dev-perl/URI
	virtual/cron
	>=virtual/perl-CGI-3.20
	virtual/perl-digest-base
	virtual/perl-File-Spec
	virtual/perl-libnet
	virtual/perl-Time-Local"

need_httpd_cgi

src_install() {
	webapp_src_preinst

	dodoc AUTHORS COPYRIGHT readme.txt
	dohtml T*.html INSTALL.html
	rm -f readme.txt T*.html INSTALL.html

	mv bin/LocalLib.cfg{.txt,}

	insinto "${MY_HTDOCSDIR}"
	doins -r .

	for f in $(find data pub); do
		webapp_serverowned "${MY_HTDOCSDIR}"/${f}
	done

	for f in bin/setlib.cfg bin/LocalLib.cfg; do
		webapp_configfile "${MY_HTDOCSDIR}"/${f}
	done

	webapp_hook_script "${FILESDIR}"/reconfig
	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt

	webapp_src_install
}

pkg_postinst() {
	ewarn
	ewarn "If you are upgrading from an older version of TWiki, back up your"
	ewarn "data/ and pub/ directories and any local changes before upgrading!"
	ewarn
	ewarn "You are _strongly_ encouraged to to read the upgrade guide:"
	ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation"
	ewarn
	webapp_pkg_postinst
}



-- 
gentoo-commits@l.g.o mailing list