merge
authorDa Risk <da_risk@elyzion.net>
Thu, 23 Sep 2010 11:59:48 +0200
changeset 6 296a58446d22
parent 5 42fc41c83e9b (current diff)
parent 4 fd06ef638c97 (diff)
child 10 2e8ff43534a2
child 11 84a7692ceb92
merge
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-vcs/mercurial-server/ChangeLog	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,53 @@
+# ChangeLog for dev-vcs/mercurial-server
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  27 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  mercurial-server-1.0.1.ebuild:
+  Python ABI fixes
+
+  11 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  mercurial-server-1.0.1.ebuild:
+  fixed bug #286695#c8 (tnx to Domen Kozar)
+
+  06 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  mercurial-server-1.0.1.ebuild:
+  updates due to dev-util -> dev-vcs
+
+  06 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  -mercurial-server-0.9.ebuild, -mercurial-server-1.0.ebuild:
+  clean up
+
+  15 Jan 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  mercurial-server-1.0.1.ebuild:
+  Added ~amd64 keyword
+
+*mercurial-server-1.0.1 (03 Jan 2010)
+
+  03 Jan 2010; Christoph Junghans <kleiner_otti@gmx.de>
+  +mercurial-server-1.0.1.ebuild:
+  Version bump
+
+*mercurial-server-1.0 (13 Dec 2009)
+
+  13 Dec 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  +mercurial-server-1.0.ebuild:
+  version bump to 1.0
+
+*mercurial-server-0.9 (14 Nov 2009)
+
+  14 Nov 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  -mercurial-server-0.6.ebuild, +mercurial-server-0.9.ebuild,
+  +files/mercurial-server-0.9-docbook-path.patch:
+  version bump to 0.9
+
+  28 Sep 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  mercurial-server-0.6.ebuild:
+  Homepage updated, bug 286695
+
+*mercurial-server-0.6 (27 Sep 2009)
+
+  27 Sep 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  +mercurial-server-0.6.ebuild, +metadata.xml:
+  Initial commit
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-vcs/mercurial-server/Manifest	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mercurial-server-0.9-docbook-path.patch 1038 RMD160 41262720f38576b47bdbb8a22097f54ddaa57c25 SHA1 52bc6cfd6fb1ff125b65f1a4a58e4b672ab3895e SHA256 7f443fe6f54fd62db06c93ae8340cda2e1e39052f0121cdf13fa68aa11630c7e
+DIST mercurial-server_1.0.1.tar.gz 20302 RMD160 e6ba21bca38f4b9cb48229fe000779dcf9b39072 SHA1 9f9b5b4a6f2a0cbbae8374db744350561618ff8d SHA256 6d67b8584730883c83972d35cf77bd1b45e7d2222458c5c3ac4ae94b3ec8f1ee
+EBUILD mercurial-server-1.0.1.ebuild 2333 RMD160 bf8d9463239e38d3d3012979458034817352cae4 SHA1 cf7d74fac9737d1a7166b9fcbeceda769511baa1 SHA256 90e5a9bff96e65bc3136d156d11290efa473494c1592a05345ae068a219504f9
+MISC ChangeLog 1527 RMD160 b6e5b207408f32ae09cd6cae9fd3be2015ccf9cc SHA1 04e0f5252694ed5a685901c59f4af2cbd216b63c SHA256 35d8bd707a9eb39cb7072d6563b072f38fc5f5c4d2324bfd0b6d653aa9eb0e9d
+MISC metadata.xml 220 RMD160 fd3dba7eeac39bb91e6658be7d4d846249c1c329 SHA1 0aafe188f55c4c22697755bea33de012cccf3f49 SHA256 0b5c322d93461039b700509ae2671b429f0637f66596c61e48ebba9e365c9f92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwnjEUACgkQgAnW8HDreRbI0QCg0d/neVHR+cXuUmYpneSd0lYS
+EuIAoI2QvQ6Mq57WT9NngIU8VOsCz8l0
+=jNzi
+-----END PGP SIGNATURE-----
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-vcs/mercurial-server/files/mercurial-server-0.9-docbook-path.patch	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Christoph Junghans <kleiner_otti@gmx.de>
+# Date 1258219410 -3600
+# Node ID ddd0f0d12e128a4f90f5a5faf577239e6e2aedd9
+# Parent  31e862df1884641a650e907909e247e1d9afb4a4
+make docbook stylesheet path changeable
+
+diff -r 31e862df1884 -r ddd0f0d12e12 Makefile
+--- a/Makefile	Thu Nov 12 11:19:36 2009 +0000
++++ b/Makefile	Sat Nov 14 18:23:30 2009 +0100
+@@ -5,6 +5,7 @@
+ DOCDIR=$(PREFIX)/doc/mercurial-server
+ ETCDIR=/etc/mercurial-server
+ NEWUSER=hg
++XSL=/usr/share/xml/docbook/stylesheet/nwalsh
+ 
+ INSTALL=install
+ 
+@@ -29,11 +30,11 @@
+ 	$(INSTALL) -m 644 -t $(DESTDIR)$(DOCDIR)/html build/html/index.html
+ 
+ build/html/index.html: doc/manual.docbook
+-	xsltproc --nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl $^
++	xsltproc --nonet -o $@ $(XSL)/html/docbook.xsl $^
+ 
+ build/pdf/manual.pdf: doc/manual.docbook
+ 	mkdir -p build/pdf
+-	fop -xml $^ -xsl /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl $@
++	fop -xml $^ -xsl $(XSL)/fo/docbook.xsl $@
+ 
+ pythonbuild:
+ 	python setup.py build
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="Mercurial authentication and authorization tools"
+HOMEPAGE="http://www.lshift.net/mercurial-server.html"
+SRC_URI="http://dev.lshift.net/paul/mercurial-server/mercurial-server_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="dev-vcs/mercurial"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+
+S="${WORKDIR}/${PN}_${PV}.orig"
+
+pkg_setup() {
+	enewgroup hg
+	enewuser hg -1 /bin/sh /home/hg hg
+	chmod 700 /home/hg
+	python_set_active_version 2
+}
+
+src_compile() {
+	emake DOCBOOK_XSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets || die "emake failed"
+}
+
+src_install() {
+	emake installfiles PREFIX="${EPREFIX}"/usr/share DOCDIR="${EPREFIX}/usr/share/doc/${PF}" DESTDIR="${D}" || die
+}
+
+pkg_postinst() {
+	#skip the comments if there is already a hgadmin repo
+	if [ ! -d "${EPREFIX}"/home/hg/repos/hgadmin/.hg ]; then
+		#Parts could be done automatically, but maybe there is a user hg
+		elog "This seem to be a first time install, things you may want to do"
+		elog "-Add your public ssh key to root key folder"
+		elog "  sudo cp ~/.ssh/id_rsa.pub ${EROOT}etc/mercurial-server/keys/root/\${USER}"
+		elog "-Create hgadmin repo"
+		elog "  sudo -H -u hg ${EROOT}usr/share/mercurial-server/init/hginit ${EROOT}usr/share/mercurial-server"
+		elog "-Init hg's ssh authorized_keys file"
+		elog "  sudo -H -u hg ${EROOT}usr/share/mercurial-server/refresh-auth"
+		elog "-Clone hgadmin repo"
+		elog "  hg clone ssh://hg@localhost/hgadmin hgadmin"
+		elog "-Start administration"
+		elog "  cd hgadmin"
+		elog "  mkdir -p keys/root"
+		elog "  cp ${ROOT}etc/mercurial-server/keys/root/\${USER} keys/root"
+		elog "  cp ${ROOT}etc/mercurial-server/access.conf ."
+		elog "  hg add"
+		elog "  hg commit -m 'initial commit'"
+		elog "  hg push ssh://hg@localhost/hgadmin"
+		elog "-Remove the key in ${EROOT}etc/mercurial-server/keys/root"
+		elog "  rm ${EROOT}etc/mercurial-server/keys/root/\${USER}"
+	fi
+	ewarn "If you are upgrading from an older version of ${PN}, please take a look at"
+	ewarn "${EROOT}usr/share/mercurial-server/init/dot-mercurial-server"
+	ewarn "and add missing lines to ~hg/.mercurial-server"
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-vcs/mercurial-server/metadata.xml	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+  <email>kleiner_otti@gmx.de</email>
+</maintainer>
+</pkgmetadata>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-p2p/torrent-search/Manifest	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,3 @@
+DIST torrent-search_0.9.0.tar.gz 684988 RMD160 67aec8c01b7f6023ffbaecfb993ab2d8c9eb5838 SHA1 c157a2929d42b0d584afc1054ce2efaa55e9571d SHA256 02ad74e8297f8eb16deee131dfe05d95f156aa73c280932bba52076a2f19d4e8
+EBUILD torrent-search-0.9.0.ebuild 632 RMD160 4f3a67779a6be5e3875c664082398b3faa56a1ff SHA1 f029985bc5879a903b8914c5989528b34bb8ffba SHA256 6d7b39f4294ea04417d0a0c502b4a15946ce4ca16d1c878f0c2a35c3ca62106a
+MISC torrent-search-0.9.0.ebuild~ 610 RMD160 d5e47309b882e7d7b7b0c707daa1a8f77eaf7952 SHA1 166247519df687386f94fa1fc6aaec613c57473e SHA256 65d2daa4b43f6649b35c6795ac59ff3701d90af65c6b981a94ec5afd94b4d968
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-p2p/torrent-search/torrent-search-0.9.0.ebuild	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit distutils python
+
+DESCRIPTION="A torrent searching application in python and GTK+"
+HOMEPAGE="http://torrent-search.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/torrent-search/torrent-search/${PV}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+PYTHON_DEPEND="2:6"
+
+S="${WORKDIR}/${PN}"
+
+DEPEND=">=sys-devel/gettext-0.17
+		>=dev-python/pygtk-2.12
+		>=dev-libs/libxml2-2.7.6[python]
+		>=dev-python/dbus-python-0.83.0
+		dev-python/httplib2"
+
+RDEPEND="${DEPEND}"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/x11-libs/gtkdatabox/ChangeLog	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,18 @@
+# ChangeLog for x11-libs/gtkdatabox
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkdatabox/ChangeLog,v 1.3 2009/09/18 16:46:53 tove Exp $
+
+  18 Sep 2009; Torsten Veller <tove@gentoo.org> gtkdatabox-0.9.1.1.ebuild:
+  || "..." -> || die "..."
+
+  27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  gtkdatabox-0.9.1.1.ebuild:
+  Works on ~x86 so keyword.
+
+*gtkdatabox-0.9.1.1 (26 Jun 2009)
+
+  26 Jun 2009; Romain Perier <mrpouet@gentoo.org>
+  +gtkdatabox-0.9.1.1.ebuild, +metadata.xml:
+  New ebuild, import from scarabeus's overlay
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/x11-libs/gtkdatabox/Manifest	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,5 @@
+AUX gtkdatabox-gtk-2.20.patch 1013 RMD160 6be70b3695f25f19b396530c3d6c55ac5b86d810 SHA1 ec2f316d1a068a9e9645482816e6ea6462964291 SHA256 25962f341e2cccc0abcdcf4d3f31074d09e84d7424e7526746d7ad70a7aeaef8
+DIST gtkdatabox-0.9.1.1.tar.gz 420545 RMD160 9838387ac6c69cea5a8e024828f588f15028878e SHA1 dd086f64af52f2a70b2a776d607c870419474289 SHA256 46bc7f0b88aa86be75d72e26305e1f759ab01d3549531cfcd35b1fe54e262239
+EBUILD gtkdatabox-0.9.1.1-r1.ebuild 1252 RMD160 f33bedc5093802f15d9789e3941e1ade0570e99f SHA1 2c3cfd08b831c3fd7ef9f55affbbf9e4e37b28ad SHA256 432c3aeb20af9b9dbe0d89f3ed18dcaa29b22869e171b97733c9f01031e82502
+MISC ChangeLog 603 RMD160 48efab37e85e9ef3dbf8bea5c62be46c46cfb8d4 SHA1 fdd19fbab204c6f78d405bbb7db4504de4b7f699 SHA256 710f10fb756ba920bccb15fdd5168d65a6ababac4b70b68c53618abdfb7770f8
+MISC metadata.xml 481 RMD160 919d88d96ee1bb97e1853a7832abbe62277f8d8f SHA1 824404dfec743496a470b489a51dfa835cd80700 SHA256 24873588fa049719b5304ff07abeb2d5caeee8c521dfee40d0f23148b79e97e1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/x11-libs/gtkdatabox/files/gtkdatabox-gtk-2.20.patch	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,31 @@
+diff -urN gtkdatabox-0.9.1.1-orig/gtk/Makefile.am gtkdatabox-0.9.1.1/gtk/Makefile.am
+--- gtkdatabox-0.9.1.1-orig/gtk/Makefile.am	2009-04-18 05:15:02.000000000 +0800
++++ gtkdatabox-0.9.1.1/gtk/Makefile.am	2010-07-28 12:13:44.000000000 +0800
+@@ -7,7 +7,7 @@
+ 			gtkdatabox_scale.c\
+ 			gtkdatabox_graph.c\
+ 			gtkdatabox_xyc_graph.c\
+- 			gtkdatabox_points.c\
++			gtkdatabox_points.c\
+                         gtkdatabox_lines.c\
+                         gtkdatabox_bars.c\
+ 			gtkdatabox_markers.c\
+@@ -28,7 +28,7 @@
+ 			gtkdatabox_scale.h\
+ 			gtkdatabox_graph.h\
+ 			gtkdatabox_xyc_graph.h\
+- 			gtkdatabox_points.h\
++			gtkdatabox_points.h\
+                         gtkdatabox_lines.h\
+                         gtkdatabox_bars.h\
+ 			gtkdatabox_markers.h\
+@@ -52,9 +52,5 @@
+ AM_CFLAGS			=\
+ 			-O2\
+ 			-W -Wall -pedantic\
+-			-DG_DISABLE_DEPRECATED\
+-			-DGDK_DISABLE_DEPRECATED\
+-			-DGDK_PIXBUF_DISABLE_DEPRECATED\
+-			-DGTK_DISABLE_DEPRECATED\
+ 			-DGTK_MULTIHEAD_SAFE=1\
+ 			`pkg-config gtk+-2.0 --cflags`
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.1.1-r1.ebuild	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkdatabox/gtkdatabox-0.9.1.1.ebuild,v 1.3 2009/09/18 16:46:53 tove Exp $
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
+HOMEPAGE="http://sourceforge.net/projects/gtkdatabox/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +glade test"
+
+RDEPEND="x11-libs/gtk+:2
+	glade? (
+		dev-util/glade:3
+		gnome-base/libglade
+	)
+"
+
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gtk-2.20.patch" ||  die "fail to patch..."
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libtool-lock \
+		--disable-dependency-tracking \
+		$(use_enable glade libglade) \
+		$(use_enable glade) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable test gtktest)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
+
+	if use examples; then
+		emake clean -C examples || die "Cleaning examples failed"
+		docinto examples
+		dodoc "${S}/examples/*" || die "Copy examples to doc failed."
+	fi
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/x11-libs/gtkdatabox/metadata.xml	Thu Sep 23 11:59:48 2010 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>mrpouet@gentoo.org</email>
+		<name>Romain Perier</name>
+		<description>Gtk+ Widgets for live display fluctuating numerical data</description>
+	</maintainer>
+	<use>
+	  <flag name='glade'>Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget</flag>
+	</use>
+</pkgmetadata>