webappify viewvc, #182093

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index d6317432f56445dc640d6d4e1c2c0e17e158b975..c83e83b1bbbcd416027fb9d4ab8037874506552e 100644 (file)
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/viewvc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.15 2007/10/26 16:13:20 wrobel Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.16 2008/02/20 13:04:17 hollow Exp $
+
+*viewvc-1.0.4-r1 (20 Feb 2008)
+
+  20 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  -viewvc-1.0.3.ebuild, viewvc-1.0.4.ebuild, +viewvc-1.0.4-r1.ebuild:
+  webappify viewvc, #182093
 
   26 Oct 2007; wrobel@gentoo.org viewvc-1.0.4.ebuild:
   Fixed message on installing the ebuild (see #179612).

diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index b8f3425eec9d2dc9fe7b0977fd9a3a855724b192..cc1051a409aa2ad91ff6f9e8b41833b75e01186c 100644 (file)
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,6 +1,15 @@
-DIST viewvc-1.0.3.tar.gz 406570 RMD160 2e36a2f1228b0648ac003c75469a1bce56e024f3 SHA1 4523be70f3cf743991201b82f93fcd7f9799b955 SHA256 20cf5a8c5e46a147f4b484934f5f254d9acf74f149a4dc6326d0040527513ead
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST viewvc-1.0.4.tar.gz 383491 RMD160 2f08d6697d69bbdf0d6660be0000d1a1aef76faa SHA1 6946266c8d7392f8c8b7b890723c23d57926891f SHA256 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f
-EBUILD viewvc-1.0.3.ebuild 2780 RMD160 27e63de2b1c94e8b8be2922ee36172e2b078a3e3 SHA1 1810575a6918c3e8ffa8cda9fc35a008edcd630e SHA256 28a3491127dbd76d2cacaab4572e8b181583f53a3019f333dab7dedfa066eb8e
-EBUILD viewvc-1.0.4.ebuild 2901 RMD160 9e0b2fdc562c8513e716246a5dfef17c670cd2c3 SHA1 1487f27f09cea37157160fa3fdf7aba97927b8ce SHA256 17c515bfe057d2076a966af5c57db809345a135664d071072ad7e7852a18bb32
-MISC ChangeLog 1981 RMD160 e84b317b9a9fa58d9754b7ab664fa79556433550 SHA1 d7f5787f1c4e17097c485bdd551d5563791d82f4 SHA256 8b08f2d8636082a38684b07f77af0d3c53e2ae5474934a0492c9fa7157851fff
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+EBUILD viewvc-1.0.4-r1.ebuild 2635 RMD160 67fb991de83a676cc983a6c67745ff149a5fd572 SHA1 b8b1dcce2ebc962c155b7dcf6a91e6f35ab3d431 SHA256 e787c2f1ac71b25074d0217ee7e57daeb6c5458213294298515028e86e04d229
+EBUILD viewvc-1.0.4.ebuild 2900 RMD160 5ba64c9f405a45cbc6e4d6e78fdaf974afa052a6 SHA1 c39e5bd71c8dcc770f4339081038a905bee67c6e SHA256 3945562ad0176601a25c44f9c4ddf6954003be80241602b54f7e82a0db5f2cda
+MISC ChangeLog 2176 RMD160 6e40a602462ecfe572e279321608573369945f06 SHA1 1a24b88f98b248e1aab2a3d532ba835a8e77bafc SHA256 b4ccee64061b5af263bf001e4732993ae5e821d882f7998186b699ed7f64de3d
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke8JVcACgkQmPFBzbX68WFqmQCeKk+LWOV1B8g2q6aFwlEQaWYS
+tAMAnjSnMxzHtsveGbM/roYF7W/tuMy9
+=FkTA
+-----END PGP SIGNATURE-----

diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
index 95c06f0095bb5e1cb1425260446652b686ec5c8f..6632069b5affe97b4a3e8c8a10c3fef22951c014 100644 (file)
--- a/www-apps/viewvc/metadata.xml
+++ b/www-apps/viewvc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+       <herd>web-apps</herd>
 </pkgmetadata>

diff --git a/www-apps/viewvc/viewvc-1.0.3.ebuild b/www-apps/viewvc/viewvc-1.0.3.ebuild
deleted file mode 100644 (file)
index a044034..0000000
--- a/www-apps/viewvc/viewvc-1.0.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.0.3.ebuild,v 1.9 2007/09/08 01:21:56 beandog Exp $
-
-inherit python eutils
-
-SLOT="0"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-SRC_URI="http://viewvc.tigris.org/files/documents/3330/34803/${P}.tar.gz"
-
-LICENSE="viewcvs"
-KEYWORDS="~amd64 ppc ~sparc x86"
-IUSE="cvs cvsgraph enscript highlight mod_python mysql subversion"
-
-RDEPEND="
-               cvs? (
-                       >=dev-lang/python-1.5.2
-                       app-text/rcs
-               )
-
-               subversion? (
-                       >=dev-lang/python-2.0
-                       >=dev-util/subversion-1.2.0
-               )
-
-               cvsgraph? ( >=dev-util/cvsgraph-1.5.0 )
-               enscript? ( app-text/enscript )
-               highlight? ( >=app-text/highlight-2.2.10 )
-               mod_python? ( www-apache/mod_python )
-               mysql? (
-                       >=dev-python/mysql-python-0.9.0
-               )
-"
-
-pkg_setup() {
-       if use subversion && ! built_with_use dev-util/subversion python ; then
-               eerror "Your Subversion has been built without Python bindings"
-               die "Emerge dev-util/subversion with USE=\"python\""
-       fi
-}
-
-src_unpack() {
-       unpack ${A} && cd ${S}
-
-       python_version
-       local LIB_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
-       local CONF_PATH="/usr/share/webapps/${PN}/viewvc.conf"
-       find bin -type f |
-               xargs sed -ie " s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${LIB_DIR}\"|g
-                                               s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONF_PATH}\",g"
-       sed -i "s|template_dir = templates|template_dir = /usr/share/webapps/${PN}/templates|" \
-               viewvc.conf.dist
-}
-
-src_install() {
-       python_version
-
-       dodir /usr/share/webapps/${PN} /usr/share/webapps/${PN}/cgi-bin \
-               /usr/share/webapps/${PN}/mod_python /usr/share/webapps/${PN}/bin \
-               /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-
-       exeinto /usr/share/webapps/${PN}/cgi-bin
-       doexe bin/cgi/viewvc.cgi
-
-       if use mysql ; then
-               exeinto /usr/share/webapps/${PN}/cgi-bin
-               doexe bin/cgi/query.cgi
-       fi
-
-       if use mod_python ; then
-               insinto /usr/share/webapps/${PN}/mod_python
-               doins bin/mod_python/viewvc.py
-               doins bin/mod_python/handler.py
-               doins bin/mod_python/.htaccess
-
-               if use mysql ; then
-                       insinto /usr/share/webapps/${PN}/mod_python
-                       doins bin/mod_python/query.py
-               fi
-       fi
-
-       cp -p bin/ ${D}/usr/share/webapps/${PN}/bin
-       cp -rp templates ${D}/usr/share/webapps/${PN}
-       cp -rp lib/* ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-
-       insinto /usr/share/webapps/${PN}
-       doins viewvc.conf.dist cvsgraph.conf.dist
-
-       dodoc CHANGES COMMITTERS INSTALL README TODO
-       dohtml -r viewvc.org/*
-}
-
-pkg_postinst() {
-       python_version
-       python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-
-       elog "Now read /usr/share/doc/${P}/INSTALL.gz to configure ${PN}"
-}
-
-pkg_postrm() {
-       python_version
-       python_mod_cleanup
-}

diff --git a/www-apps/viewvc/viewvc-1.0.4-r1.ebuild b/www-apps/viewvc/viewvc-1.0.4-r1.ebuild
new file mode 100644 (file)
index 0000000..26d0b6e
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.0.4-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.0.4-r1.ebuild,v 1.1 2008/02/20 13:04:17 hollow Exp $
+
+inherit confutils webapp python eutils
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.tigris.org/files/documents/3330/37319/${P}.tar.gz"
+
+LICENSE="viewcvs"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cvs cvsgraph enscript highlight mod_python mysql subversion"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="
+       cvs? (
+               >=dev-lang/python-1.5.2
+               app-text/rcs
+       )
+
+       subversion? (
+               >=dev-lang/python-2.0
+               >=dev-util/subversion-1.2.0
+       )
+
+       mod_python? ( www-apache/mod_python )
+       !mod_python? ( virtual/httpd-cgi )
+
+       cvsgraph? ( >=dev-util/cvsgraph-1.5.0 )
+       enscript? ( app-text/enscript )
+       highlight? ( >=app-text/highlight-2.2.10 )
+       mysql? ( >=dev-python/mysql-python-0.9.0 )
+"
+
+pkg_setup() {
+       webapp_pkg_setup
+
+       confutils_require_any cvs subversion
+       confutils_use_depend_built_with_all subversion dev-util/subversion python
+
+       python_version
+       MOD_PATH=/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       find bin/ -type f -print0 | xargs -0 sed -i \
+               -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${MOD_PATH}\"|g" \
+               -e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g"
+
+       sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
+               lib/config.py
+
+       sed -i -e "s|^template_dir.*|#&|" viewvc.conf.dist
+       mv viewvc.conf{.dist,}
+       mv cvsgraph.conf{.dist,}
+}
+
+src_install() {
+       webapp_src_preinst
+       python_version
+
+       dodoc CHANGES COMMITTERS INSTALL README TODO
+       dohtml -r viewvc.org/*
+
+       insinto "${MOD_PATH}"
+       doins -r lib/
+
+       insinto "${MY_APPDIR}"/templates
+       doins -r templates/
+
+       if use mysql; then
+               insinto "${MY_HOSTROOTDIR}"/bin
+               dobin bin/{*dbadmin,make-database,loginfo-handler}
+       fi
+
+       insinto "${MY_HOSTROOTDIR}"/conf
+       doins {viewvc,cvsgraph}.conf
+
+       if use mod_python; then
+               insinto "${MY_HTDOCSDIR}"
+               doins bin/mod_python/viewvc.py
+               doins bin/mod_python/handler.py
+               doins bin/mod_python/.htaccess
+               use mysql && doins bin/mod_python/query.py
+       else
+               exeinto "${MY_CGIBINDIR}"
+               doexe bin/cgi/viewvc.cgi
+               use mysql && doexe bin/cgi/query.cgi
+       fi
+
+       webapp_configfile "${MY_HOSTROOTDIR}"/conf/{viewvc,cvsgraph}.conf
+
+       webapp_src_install
+}
+
+pkg_postinst() {
+       webapp_pkg_postinst
+       python_version
+       python_mod_optimize "${ROOT}${MOD_PATH}"
+       elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
+}
+
+pkg_postrm() {
+       python_version
+       python_mod_cleanup
+}

diff --git a/www-apps/viewvc/viewvc-1.0.4.ebuild b/www-apps/viewvc/viewvc-1.0.4.ebuild
index 5b4c43c36ad524fe25c70f0ab4ac041197ec917f..c44e76de795cf9e82595177d8bbe6aa62d73e656 100644 (file)
--- a/www-apps/viewvc/viewvc-1.0.4.ebuild
+++ b/www-apps/viewvc/viewvc-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# 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/viewvc/viewvc-1.0.4.ebuild,v 1.9 2007/10/26 16:13:20 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.0.4.ebuild,v 1.10 2008/02/20 13:04:17 hollow Exp $
 
 inherit python eutils
 
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-       unpack "${A}" && cd "${S}"
+       unpack ${A} && cd "${S}"
 
        python_version
        local LIB_DIR="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"