Add pyrep. Change less-select, zram-init to github. Update checksums

10 files changed, 91 insertions, 32 deletions

diff --git a/dev-util/pyrep/ChangeLog b/dev-util/pyrep/ChangeLog
new file mode 100644
index 00000000..ac5bac26
--- /dev/null
+++ b/dev-util/pyrep/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-util/pyrep
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header $
+
+*pyrep-1.1 (02 Mar 2012)
+
+  02 Mar 2012; Martin Väth <martin@mvath.de>
+  New ebuild from scratch.
diff --git a/dev-util/pyrep/Manifest b/dev-util/pyrep/Manifest
new file mode 100644
index 00000000..d8ad6e1a
--- /dev/null
+++ b/dev-util/pyrep/Manifest
@@ -0,0 +1 @@
+DIST pyrep-1.1.tar.gz 8539 RMD160 03be2dc1c21072e0d40d6273c25a7f0f8a23e78c SHA1 5116a01c491b64bcc9d95f2a94ea69139a39425b SHA256 d6c927396e11fbdfed6fde7048a54b77d74776fe5cfa8a25ab9af5d8b4146280
diff --git a/dev-util/pyrep/metadata.xml b/dev-util/pyrep/metadata.xml
new file mode 100644
index 00000000..0c91bdcd
--- /dev/null
+++ b/dev-util/pyrep/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+	<email>martin@mvath.de</email>
+	<name>Martin Väth</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/pyrep/pyrep-1.1.ebuild b/dev-util/pyrep/pyrep-1.1.ebuild
new file mode 100644
index 00000000..29cec102
--- /dev/null
+++ b/dev-util/pyrep/pyrep-1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="4"
+RESTRICT="mirror"
+
+DESCRIPTION="Search and/or replace regular expressions within many files interactively"
+HOMEPAGE="https://github.com/vaeth/${PN}"
+SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/python"
+
+src_unpack() {
+	default
+	cd *"${PN}"-*
+	S="${PWD}"
+}
+
+src_install() {
+	dobin "${PN}"
+}
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index a278cfbe..bd38ab92 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -4,6 +4,9 @@
 
 *less-445-r1.ebuild (10 Nov 2011)
 
+  02 Mar 2012; Martin Väth <martin@mvath.de>
+  Change to github repository.
+
   31 Jan 2012; Martin Väth <martin@mvath.de>
   Bump lesspipe.sh from tree
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 4a3f27c1..bfb2f23a 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,3 +1,3 @@
 DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d
 DIST less-445.tar.gz 307824 RMD160 dbd23a0a0890a89a42c71d6092f3545cb2bc529c SHA1 120c179ab5927bed4ebcda6541082889fed73311 SHA256 66254dbd8142a90821968df249b4e268f53997cb12755d2a7116174b1a35a8bd
-DIST less-select-patch-436.tar.gz 47383 RMD160 5ccbe853d1f6ce5940f283bd8265ce8b75e20363 SHA1 21f3f8b16be8cd0724820c167d6f685d236cec36 SHA256 bbdd0ee9241803b8de719c358090354bde63472d1df6db271a50be51bfc800f3
+DIST less-select-2.2.tar.gz 25047 RMD160 24d5f18785ac6aa45b74e78c32d16d3ce5ad95df SHA1 c64825b034b8fa7d356ac3fd08fb45e605a05aa0 SHA256 b9a35194fd6c188a9aedc6835b233f0e8078df0e309e39067c893b8b1f73141f
diff --git a/sys-apps/less/less-445-r1.ebuild b/sys-apps/less/less-445-r1.ebuild
index 41256946..b9385c9c 100644
--- a/sys-apps/less/less-445-r1.ebuild
+++ b/sys-apps/less/less-445-r1.ebuild
@@ -6,43 +6,42 @@ EAPI="4"
 inherit eutils
 
 DESCRIPTION="Excellent text file viewer, optionally with additional selection feature"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+PATCHN="less-select"
+PATCHV="2.2"
 PATCHVER="436"
+PATCHBALL="${PATCHN}-${PATCHV}.tar.gz"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
-	http://www-zeuthen.desy.de/~friebel/unix/less/code2color
-	less-select? ( http://www.mathematik.uni-wuerzburg.de/~vaeth/download/less-select-patch-${PATCHVER}.tar.gz )"
+	less-select? ( http://github.com/vaeth/${PATCHN}/tarball/release-${PATCHV} -> ${PATCHBALL} )
+	http://www-zeuthen.desy.de/~friebel/unix/less/code2color"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+less-select pcre original-gentoo unicode"
 
-RDEPEND=">=app-misc/editor-wrapper-3
+DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2
 	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-
-SELECTDIR="${WORKDIR}/less-select-patch-${PATCHVER}"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
 	cp "${DISTDIR}"/code2color "${S}"/
 	if use less-select
-	then	unpack "less-select-patch-${PATCHVER}.tar.gz"
+	then	unpack ${PATCHBALL}
+		cd *"${PATCHN}"-*
+		SELECTDIR="${PWD}"
 	fi
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/code2color.patch
 	if use less-select
-	then	mv -- "${SELECTDIR}/INSTALL" "${SELECTDIR}/README.less-select"
-		if test -e "${SELECTDIR}/less-${PV}-select.patch"
-		then	epatch "${SELECTDIR}/less-${PV}-select.patch" || die "Patch less-${PV}-select failed"
-		else	epatch "${SELECTDIR}/less-${PATCHVER}-select.patch" || die "Patch less-${PATCHVER}-select failed"
-		fi
+	then	epatch "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" || die
 		"${SELECTDIR}"/after-patch || die "${SELECTDIR}/after-patch failed"
 		sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX%/}"'/etc/less/select-key.bin|g' \
-			"${SELECTDIR}/less-select"
+			"${SELECTDIR}/bin/less-select" || die
 	fi
 }
 
@@ -61,8 +60,8 @@ src_configure() {
 src_compile() {
 	default
 	if use less-select
-	then	./lesskey -o less-normal-key.bin "${SELECTDIR}/less-normal-key.src" || die
-		./lesskey -o less-select-key.bin "${SELECTDIR}/less-select-key.src" || die
+	then	./lesskey -o normal-key.bin "${SELECTDIR}/keys/less-normal-key.src" || die
+		./lesskey -o select-key.bin "${SELECTDIR}/keys/less-select-key.src" || die
 	fi
 }
 
@@ -83,14 +82,13 @@ src_install() {
 	dodoc NEWS README* "${FILESDIR}"/README.Gentoo
 
 	if use less-select
-	then	dodoc "${SELECTDIR}"/README.less-select
-		newbin "${SELECTDIR}/less-select" less-select
+	then	newdoc "${SELECTDIR}"/README README.less-select
+		dobin "${SELECTDIR}/bin/"*
 		insinto /etc/less
 		# The first is required for less-select, the others are optional
-		newins less-select-key.bin select-key.bin
-		newins less-normal-key.bin normal-key.bin
-		newins "${SELECTDIR}/less-select-key.src" select-key.src
-		newins "${SELECTDIR}/less-normal-key.src" normal-key.src
+		doins select-key.bin normal-key.bin
+		newins "${SELECTDIR}/keys/less-select-key.src" select-key.src
+		newins "${SELECTDIR}/keys/less-normal-key.src" normal-key.src
 	fi
 }
 
diff --git a/sys-block/zram-init/ChangeLog b/sys-block/zram-init/ChangeLog
index 6aac1d68..e80d3ca4 100644
--- a/sys-block/zram-init/ChangeLog
+++ b/sys-block/zram-init/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/zram-init
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+*zram-init-2.1.ebuild (02 Mar 2012)
+
+  02 Mar 2012; Martin Väth <martin@mvath.de>
+  Version bump, remove old ebuild. Changes to github repository.
+
+*zram-init-2.0.ebuild (08 Feb 2010)
+
   08 Feb 2010; Martin Väth <martin@mvath.de>
   Complete rewrite. Remove old ChangeLog.
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index fc471c12..2a0bc787 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1 +1 @@
-DIST zram-init-2.tar.gz 2264 RMD160 eb03b71aebaec8c251cab6fb79ebd771cae57a81 SHA1 396527e0278d344a0171e34b745edafeca51bd10 SHA256 d3d42cf0de1b01898aea480545b5612f1bc4ab6ab89bb8737fa45983c17a634c
+DIST zram-init-2.1.tar.gz 2875 RMD160 4f02719cfab477799f1a4473edbab286d981d273 SHA1 bde5b28941d8625cbb76e21b34db0757fe878354 SHA256 080d00d5d67bb603de72e6193366f15e5326aba360270c7afa7d78347d9e3c58
diff --git a/sys-block/zram-init/zram-init-2.ebuild b/sys-block/zram-init/zram-init-2.1.ebuild
index 0441950e..f54d0206 100644
--- a/sys-block/zram-init/zram-init-2.ebuild
+++ b/sys-block/zram-init/zram-init-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
@@ -6,21 +6,27 @@ EAPI="4"
 RESTRICT="mirror"
 
 DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="http://www.mathematik.uni-wuerzburg.de/~vaeth/download/index.html"
-SRC_URI="http://www.mathematik.uni-wuerzburg.de/~vaeth/download/${P}.tar.gz"
+HOMEPAGE="https://github.com/vaeth/${PN}"
+SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion"
 
+src_unpack() {
+	default
+	cd *"${PN}"-*
+	S="${PWD}"
+}
+
 src_install() {
-	dosbin zram-init
-	newinitd zram-init.initd zram-init
-	newconfd zram-init.confd zram-init
+	dosbin sbin/*
+	doinitd openrc/init.d/*
+	doconfd openrc/conf.d/*
 	if use zsh-completion
 	then	insinto /usr/share/zsh/site-functions
-		doins _zram-init
+		doins zsh/*
 	fi
 }