From 91ee39ffb6a115e4789e7fc393c6f1ce8a240500 Mon Sep 17 00:00:00 2001 From: Jakub Moc Date: Sat, 15 Sep 2007 08:57:03 +0000 Subject: www-apps/didiwiki: Switch SRC_URI to Debian as upstream went MIA, also use their patchset. svn path=/experimental/; revision=633 --- www-apps/didiwiki/ChangeLog | 5 +++ www-apps/didiwiki/Manifest | 6 ---- www-apps/didiwiki/didiwiki-0.5-r1.ebuild | 30 ----------------- www-apps/didiwiki/didiwiki-0.5_p5.ebuild | 46 ++++++++++++++++++++++++++ www-apps/didiwiki/didiwiki-0.5_pl5.ebuild | 30 +++++++++++++++++ www-apps/didiwiki/files/didiwiki-0.5.conf | 8 ----- www-apps/didiwiki/files/didiwiki-0.5.rc | 32 ------------------ www-apps/didiwiki/files/didiwiki.conf | 8 +++++ www-apps/didiwiki/files/didiwiki.rc | 32 ++++++++++++++++++ www-apps/didiwiki/files/digest-didiwiki-0.5-r1 | 3 -- 10 files changed, 121 insertions(+), 79 deletions(-) delete mode 100644 www-apps/didiwiki/Manifest delete mode 100644 www-apps/didiwiki/didiwiki-0.5-r1.ebuild create mode 100644 www-apps/didiwiki/didiwiki-0.5_p5.ebuild create mode 100644 www-apps/didiwiki/didiwiki-0.5_pl5.ebuild delete mode 100644 www-apps/didiwiki/files/didiwiki-0.5.conf delete mode 100644 www-apps/didiwiki/files/didiwiki-0.5.rc create mode 100644 www-apps/didiwiki/files/didiwiki.conf create mode 100644 www-apps/didiwiki/files/didiwiki.rc delete mode 100644 www-apps/didiwiki/files/digest-didiwiki-0.5-r1 (limited to 'www-apps/didiwiki') diff --git a/www-apps/didiwiki/ChangeLog b/www-apps/didiwiki/ChangeLog index 2927741..77e3f65 100644 --- a/www-apps/didiwiki/ChangeLog +++ b/www-apps/didiwiki/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Sep 2007; Jakub Moc -files/didiwiki-0.5.conf, + -files/didiwiki-0.5.rc, ++, ++, -didiwiki-0.5-r1.ebuild, + +didiwiki-0.5_p5.ebuild: + Switch SRC_URI to Debian as upstream went MIA, also use their patchset. + 13 Sep 2007; Jakub Moc didiwiki-0.5-r1.ebuild: Only display pkg_postinst info when relevant diff --git a/www-apps/didiwiki/Manifest b/www-apps/didiwiki/Manifest deleted file mode 100644 index 0fd0fbb..0000000 --- a/www-apps/didiwiki/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX didiwiki-0.5.conf 203 RMD160 1c730ad9ee5affc4b9938e26bca89833c58d2aaf SHA1 a156afd5cea35d1f155360edefdd418039203486 SHA256 7400d883f6cda9bc74f417b6c8329ac9957af22109da03a5d98ee5622717a599 -AUX didiwiki-0.5.rc 968 RMD160 a91a33abdc20b49fc15fc9b91a8c7f3f8eec165a SHA1 d66a523d931069c267983b9135397f57438b4afc SHA256 a985a1bfb9259fe97ea044b47299313fc0f324425962d9a976f39050ac0a8e6b -DIST didiwiki-0.5.tar.gz 99569 RMD160 47ec989a54a476fbaa249541b434142e3dcebf73 SHA1 3a338305a020951243344ef27e42f163f52288ea SHA256 31e8e536f5efd7d7d1d5f4e4458b42aa9cd7910acf3da933cb7fa3507cf7f752 -EBUILD didiwiki-0.5-r1.ebuild 692 RMD160 1a9781fe54cdbdefe1ee63b335f6c7fdbeb93f26 SHA1 23c10a0269e1b8a823102a18d4c17c00f770d1c4 SHA256 52d245fe034cf768f02f364d1e3ef3e9482208e4969444c7b4f02dc7b810d885 -MISC ChangeLog 445 RMD160 fbe681ce8b7f68a7bd1921a6dc27a0e4f785c21e SHA1 c10eeb307e770b5ffa67051dd764353dca4b0aa7 SHA256 4daaace350b031e0e3b90f18c971a1c34fa060994fd7df19a585973cc8b0cbe8 -MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 diff --git a/www-apps/didiwiki/didiwiki-0.5-r1.ebuild b/www-apps/didiwiki/didiwiki-0.5-r1.ebuild deleted file mode 100644 index 439b8ae..0000000 --- a/www-apps/didiwiki/didiwiki-0.5-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -DESCRIPTION="A small and simple personal WikiWikiWeb" -HOMEPAGE="http://didiwiki.org/" -SRC_URI="http://didiwiki.org/sources/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -src_compile() { - econf --prefix=/usr || die "econf failed" - emake || die "emake failed" -} - -src_install() { - dobin src/didiwiki - dodoc AUTHORS ChangeLog README TODO COPYING - - newinitd "${FILESDIR}"/${P}.rc didiwiki - newconfd "${FILESDIR}"/${P}.conf didiwiki -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${P}" ; then - elog "delete ~/.didiwiki/WikiHelp to get the latest Help file." - fi -} diff --git a/www-apps/didiwiki/didiwiki-0.5_p5.ebuild b/www-apps/didiwiki/didiwiki-0.5_p5.ebuild new file mode 100644 index 0000000..fc32f78 --- /dev/null +++ b/www-apps/didiwiki/didiwiki-0.5_p5.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils versionator + +MY_PV=$(get_version_component_range 1-2) +MY_P="${PN}_${MY_PV}" +DEBPATCH="${PN}_${PV/_p/-}.diff" + +DESCRIPTION="A small and simple personal WikiWikiWeb" +# HOMEPAGE="http://didiwiki.org/" +HOMEPAGE="http://packages.debian.org/unstable/web/didiwiki" +SRC_URI="mirror://debian/pool/main/d/didiwiki/${MY_P}.orig.tar.gz + mirror://debian/pool/main/d/didiwiki/${DEBPATCH}.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +S=${WORKDIR}/${MY_P/_/-} + +src_unpack() { + unpack ${A} + epatch ${DEBPATCH} +} + +src_compile() { + econf --prefix=/usr || die "econf failed" + emake || die "emake failed" +} + +src_install() { + dobin src/didiwiki + dodoc AUTHORS ChangeLog README TODO + doman debian/${PN}.1 + + newinitd "${FILESDIR}"/${PN}.rc didiwiki + newconfd "${FILESDIR}"/${PN}.conf didiwiki +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${P}" ; then + elog "delete ~/.didiwiki/WikiHelp to get the latest Help file." + fi +} diff --git a/www-apps/didiwiki/didiwiki-0.5_pl5.ebuild b/www-apps/didiwiki/didiwiki-0.5_pl5.ebuild new file mode 100644 index 0000000..439b8ae --- /dev/null +++ b/www-apps/didiwiki/didiwiki-0.5_pl5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="A small and simple personal WikiWikiWeb" +HOMEPAGE="http://didiwiki.org/" +SRC_URI="http://didiwiki.org/sources/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +src_compile() { + econf --prefix=/usr || die "econf failed" + emake || die "emake failed" +} + +src_install() { + dobin src/didiwiki + dodoc AUTHORS ChangeLog README TODO COPYING + + newinitd "${FILESDIR}"/${P}.rc didiwiki + newconfd "${FILESDIR}"/${P}.conf didiwiki +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${P}" ; then + elog "delete ~/.didiwiki/WikiHelp to get the latest Help file." + fi +} diff --git a/www-apps/didiwiki/files/didiwiki-0.5.conf b/www-apps/didiwiki/files/didiwiki-0.5.conf deleted file mode 100644 index 34e0afa..0000000 --- a/www-apps/didiwiki/files/didiwiki-0.5.conf +++ /dev/null @@ -1,8 +0,0 @@ -# DIDIWIKIHOME - Top directory where pages are stored. -DIDIWIKIHOME= - -# DIDIWIKIUSER - User to start didiwiki (Do NOT use root!!!) -DIDIWIKIUSER= - -# DIDIWIKIGROUP - Group to start didiwiki -DIDIWIKIGROUP= diff --git a/www-apps/didiwiki/files/didiwiki-0.5.rc b/www-apps/didiwiki/files/didiwiki-0.5.rc deleted file mode 100644 index 41cb16f..0000000 --- a/www-apps/didiwiki/files/didiwiki-0.5.rc +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: $ - -checkconfig() { - if [ -z "${DIDIWIKIHOME}" ] || [ -z "${DIDIWIKIUSER}" ] || [ -z "${DIDIWIKIGROUP}" ] ; then - eerror "Please edit /etc/conf.d/didiwiki and set DIDIWIKIHOME," - eerror "DIDIWIKIUSER and DIDIWIKIGROUP to valid settings." - return 1 - fi - if [ "${DIDIWIKIUSER}" == "root" ]; then - eerror "DIDIWIKIUSER should not be root!" - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - - export DIDIWIKIHOME - ebegin "Starting didiwiki with HOME=${DIDIWIKIHOME}, USER=${DIDIWIKIUSER}, GROUP=${DIDIWIKIGROUP}" - start-stop-daemon --quiet --chuid ${DIDIWIKIUSER}:${DIDWIKIGROUP} --start --pidfile /var/run/didiwiki.pid --background --make-pidfile --exec /usr/bin/didiwiki - eend $? -} - -stop() { - ebegin "Stopping didiwiki" - start-stop-daemon --quiet --stop --name didiwiki --exec /usr/bin/didiwiki - eend $? -} diff --git a/www-apps/didiwiki/files/didiwiki.conf b/www-apps/didiwiki/files/didiwiki.conf new file mode 100644 index 0000000..34e0afa --- /dev/null +++ b/www-apps/didiwiki/files/didiwiki.conf @@ -0,0 +1,8 @@ +# DIDIWIKIHOME - Top directory where pages are stored. +DIDIWIKIHOME= + +# DIDIWIKIUSER - User to start didiwiki (Do NOT use root!!!) +DIDIWIKIUSER= + +# DIDIWIKIGROUP - Group to start didiwiki +DIDIWIKIGROUP= diff --git a/www-apps/didiwiki/files/didiwiki.rc b/www-apps/didiwiki/files/didiwiki.rc new file mode 100644 index 0000000..0853c4d --- /dev/null +++ b/www-apps/didiwiki/files/didiwiki.rc @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: $ + +checkconfig() { + if [ -z "${DIDIWIKIHOME}" ] || [ -z "${DIDIWIKIUSER}" ] || [ -z "${DIDIWIKIGROUP}" ] ; then + eerror "Please edit /etc/conf.d/didiwiki and set DIDIWIKIHOME," + eerror "DIDIWIKIUSER and DIDIWIKIGROUP to valid settings." + return 1 + fi + if [ "${DIDIWIKIUSER}" == "root" ]; then + eerror "DIDIWIKIUSER should not be root!" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + + export DIDIWIKIHOME + ebegin "Starting didiwiki with HOME=${DIDIWIKIHOME}, USER=${DIDIWIKIUSER}, GROUP=${DIDIWIKIGROUP}" + start-stop-daemon --quiet --chuid ${DIDIWIKIUSER}:${DIDWIKIGROUP} --start --pidfile /var/run/didiwiki.pid --background --make-pidfile --exec /usr/bin/didiwiki + eend $? +} + +stop() { + ebegin "Stopping didiwiki" + start-stop-daemon --quiet --stop --name didiwiki --exec /usr/bin/didiwiki + eend $? +} diff --git a/www-apps/didiwiki/files/digest-didiwiki-0.5-r1 b/www-apps/didiwiki/files/digest-didiwiki-0.5-r1 deleted file mode 100644 index 67b7816..0000000 --- a/www-apps/didiwiki/files/digest-didiwiki-0.5-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 94d5fb06d091804b31658481f23b120f didiwiki-0.5.tar.gz 99569 -RMD160 47ec989a54a476fbaa249541b434142e3dcebf73 didiwiki-0.5.tar.gz 99569 -SHA256 31e8e536f5efd7d7d1d5f4e4458b42aa9cd7910acf3da933cb7fa3507cf7f752 didiwiki-0.5.tar.gz 99569 -- cgit v1.2.3-65-gdbad