Merge remote-tracking branch 'xtraeme/master'

srcpkgs/nix/files/nix-daemon.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Helper daemon for managing secure, multi-user Nix stores
+After=syslog.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/nix-daemon
+
+[Install]
+WantedBy=multi-user.target

srcpkgs/nix/template

@@ -0,0 +1,57 @@
+# Template file for 'nix'
+pkgname=nix
+version=1.6
+revision=1
+build_style=gnu-configure
+# Use /nix/var as suggested by the official Manual.
+configure_args="--localstatedir=/nix/var"
+hostmakedepends="pkg-config flex"
+makedepends="bzip2-devel openssl-devel sqlite-devel gc-devel curl perl-WWW-Curl perl-DBD-SQLite"
+short_desc="A purely functional package manager"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="MIT"
+homepage="http://nixos.org/nix/"
+distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"
+checksum=2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe
+
+post_install() {
+	# Remove unused stuff.
+	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/nix
+	# Let users interact with the nix-daemon by default.
+	vmkdir etc/profile.d
+	echo 'export NIX_REMOTE=daemon' > ${DESTDIR}/etc/profile.d/nix-daemon.sh
+	# Install nix-daemon systemd service.
+	vinstall ${FILESDIR}/nix-daemon.service 644 usr/lib/systemd/system
+	# Setup build users.
+	echo 'build-users-group = nixbld' > ${DESTDIR}/etc/nix/nix.conf
+}
+
+nix_package() {
+	# Default configuration file.
+	conf_files="/etc/nix/nix.conf"
+	# Extra run-time dependencies.
+	depends="curl perl-WWW-Curl perl-DBD-SQLite"
+	# Create required build users/groups.
+	system_groups="nixbld"
+	for f in $(seq 10); do
+		system_accounts+=" nixbld${f}"
+		eval export nixbld\${f}_homedir="/var/empty"
+		eval export nixbld\${f}_groups="nixbld"
+	done
+	# Register systemd service by default.
+	systemd_services="nix-daemon.service on"
+	# Create required run-time directories.
+	make_dirs="
+		/nix/var/log/nix/drvs 0755 root root
+		/nix/var/nix/profiles 0755 root root
+		/nix/var/nix/profiles/per-user 1777 root root
+		/nix/var/nix/temproots 0755 root root
+		/nix/var/nix/gcroots 0755 root root
+		/nix/var/nix/manifests 0755 root root
+		/nix/var/nix/userpool 0755 root root
+		/nix/var/nix/db 0755 root root
+		/nix/store 1775 root nixbld"
+	pkg_install() {
+		vmove all
+	}
+}

srcpkgs/perl-DBD-SQLite/template

@@ -0,0 +1,21 @@
+# Template build file for 'perl-DBD-SQLite'.
+pkgname=perl-DBD-SQLite
+version=1.40
+revision=1
+wrksrc="DBD-SQLite-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl-DBI"
+short_desc="DBD::SQLite - Self-contained RDBMS in a DBI driver"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://search.cpan.org/dist/DBD-SQLite"
+license="GPL-2"
+distfiles="${CPAN_SITE}/DBD/DBD-SQLite-$version.tar.gz"
+checksum=21fb65e740b6265512c82232b4ad8f75c19ac84c216830112656274eb8e375fb
+
+perl-DBD-SQLite_package() {
+	depends="perl-DBI"
+	pkg_install() {
+		vmove all
+	}
+}

srcpkgs/perl-DBI/template

@@ -0,0 +1,20 @@
+# Template build file for 'perl-DBI'.
+pkgname=perl-DBI
+version=1.628
+revision=1
+wrksrc="DBI-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+short_desc="Database independent interface for Perl"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://search.cpan.org/dist/DBI"
+license="GPL-2"
+distfiles="${CPAN_SITE}/DBI/DBI-$version.tar.gz"
+checksum=46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52
+
+perl-DBI_package() {
+	depends="perl"
+	pkg_install() {
+		vmove all
+	}
+}

srcpkgs/perl-WWW-Curl/template

@@ -0,0 +1,20 @@
+# Template build file for 'perl-WWW-Curl'.
+pkgname=perl-WWW-Curl
+version=4.15
+revision=1
+wrksrc="WWW-Curl-${version}"
+build_style=perl-module
+hostmakedepends="perl libcurl-devel"
+short_desc="WWW::Curl - Perl extension interface for libcurl"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://search.cpan.org/dist/WWW-Curl/"
+license="GPL-2"
+distfiles="${CPAN_SITE}/WWW/WWW-Curl-$version.tar.gz"
+checksum=3ef40494537a1ce7f848f3b524f5690cf47db458c0bb662e15c4642dc13c5fa1
+
+perl-WWW-Curl_package() {
+	depends="perl"
+	pkg_install() {
+		vmove all
+	}
+}

srcpkgs/pygobject2/template

@@ -1,25 +1,22 @@
 # Template file for 'pygobject2'
 pkgname=pygobject2
 version=2.28.6
-revision=5
+revision=7
 wrksrc=${pkgname%2}-${version}
 build_style=gnu-configure
 configure_args="--disable-introspection"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel libglib-devel cairo-devel python-devel pycairo-devel"
+makedepends="libffi-devel libglib-devel cairo-devel python-devel py2cairo-devel"
 short_desc="Python bindings for GObject (GLib 2.x)"
 homepage="http://www.pygtk.org/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
 checksum=fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
-long_desc="
- Pygobject is a set of Python bindings for the GLib's GObject library,
- version 2."
 
 pygobject2-devel_package() {
-	depends="libffi-devel libglib-devel libgirepository-devel pycairo-devel pygobject2>=${version}"
+	depends="libffi-devel libglib-devel py2cairo-devel pygobject2>=${version}"
-	short_desc+=" -- development files"
+	short_desc+=" - development files"
 	pycompile_module="usr/share/pygobject/2.0/codegen"
 	replaces="pygobject-devel<3.0.0"
 	pkg_install() {
@@ -30,10 +27,10 @@ pygobject2-devel_package() {
 }
 
 pygobject2_package() {
-	depends="cairo libgirepository python pycairo"
+	depends="cairo python py2cairo"
 	pycompile_module="glib gobject gtk-2.0 pygtk"
 	replaces="pygobject<3.0.0"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }

srcpkgs/pygtk/template

@@ -1,27 +1,25 @@
 # Template file for 'pygtk'
 pkgname=pygtk
 version=2.24.0
-revision=6
+revision=7
 build_style=gnu-configure
 # XXX: missing python-numpy build dep
 hostmakedepends="pkg-config"
-makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel"
+makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel>=2.28.6_6"
 short_desc="Python bindings for the GTK+ toolkit"
 homepage="http://www.pygtk.org"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
 checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
-long_desc="
- Pygtk is a set of Python bindings for the GTK+ toolkit."
 
 post_install() {
 	vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs
 }
 
 pygtk-devel_package() {
-	depends="python-devel gtk+-devel pygobject2-devel pycairo-devel pygtk>=${version}"
+	depends="python-devel gtk+-devel py2cairo-devel pygtk>=${version}"
-	short_desc+=" -- development files"
+	short_desc+=" - development files"
 	pycompile_module="demos"
 	pkg_install() {
 		vmove usr/include
@@ -33,9 +31,9 @@ pygtk-devel_package() {
 }
 
 pygtk_package() {
-	depends="python pygobject2 pycairo"
+	depends="python pygobject2 py2cairo"
 	pycompile_module="gtk-2.0/gtk"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }

srcpkgs/xbps-src/template

@@ -1,7 +1,7 @@
 # Template file for 'xbps-src'
 pkgname=xbps-src
-version=20130928
+version=20130930
-revision=2
+revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
 make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"

srcpkgs/zeroinstall-injector/template

@@ -0,0 +1,26 @@
+# Template file for 'zeroinstall-injector'
+pkgname=zeroinstall-injector
+version=2.3.3
+revision=2
+wrksrc="0install-${version}"
+build_style=python-module
+makedepends="python gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
+short_desc="A cross-distribution software installation system"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="LGPL-2.1"
+homepage="http://0install.net"
+distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2"
+checksum=80fbd8cd6144f1bda32415201c8978297a3ac95304e7fc73c1cc02eb8d1aca5e
+
+pre_configure() {
+	sed -i "s|man/|share/&|" setup.py
+}
+
+zeroinstall-injector_package() {
+	pycompile_module="zeroinstall"
+	depends="${makedepends}"
+	noarch=yes
+	pkg_install() {
+		vmove all
+	}
+}