Bump, proper install

2 files changed, 28 insertions, 22 deletions

diff --git a/media-tv/p2pvr/Manifest b/media-tv/p2pvr/Manifest
index eca30d8..9131ca5 100644
--- a/media-tv/p2pvr/Manifest
+++ b/media-tv/p2pvr/Manifest
@@ -1,2 +1,2 @@
-DIST p2pvr-842.tar.xz 1351564 SHA256 594bed6ca7a685a5e2ae623084221372ba46e36ae9ef7224e9030deadd59d803 SHA512 bcac28408eee0005f771e6bac283c4f74da14e6fa9c5164fe3a30c97d698aa910086b9fabb301998916e587bd59930351a0d8358d3f1990c931dadb8c51245ea WHIRLPOOL 26a7ee134aa7520c8de5ef619bc97a9a5a2806374d6693d0289ffd70eea9e82fef2f62a2a0426b6f60183145f6a2801fe508352d1ad444f3fa25b4e89439fbb6
-EBUILD p2pvr-842.ebuild 1137 SHA256 f18fb7995cebfa7956bd3d501828fe6ad740ac32c5a362a6c94709c5e559e2d8 SHA512 a797ab12a259624618ee3d8fb97ddc641a202bc0ee459d6457b5ed761293656433676f436a77ae533f56f9249fc9cc8c4a0fc45b478bb6b3a9b409fa81055c0f WHIRLPOOL 796170ea14f9aed14d72e2b3d042c196170f9315b1deb3f624009f13ef7558d932e53d8f86b505a662db55d8d5086c5eefc2fe870a9e6c592cd40640dd1b326a
+DIST p2pvr-915.tar.bz2 1389413 SHA256 6f0bdd80a8da2345817df9d6a3a7f8148d3f1011f6ff47b476a791303f18efee SHA512 f85dbcaa390326631ce9eacc07e3ddf9e87af1abf7a07a4621f65f041d86c8a3b611a424bda88ca7cf4442a2b95182ebbfc02d62d8635898082c0cf310d508fc WHIRLPOOL 36763c1ab59e556b636e820e6a6e3c6aaaf985ccdfd400102522569a569859ed1410457a76a6a29deb099171907275e351e1971997b2952a828bca5e76679455
+EBUILD p2pvr-915.ebuild 1252 SHA256 e30c6c9989979b54329e13a88fca3ed3a3f46f63ccbc60a0317a32b89a67cb05 SHA512 9b30ce11877c847aa1280ca08f505204637a7fa8b23f7d23c134d6e4a207207f5329f7378e541976dbc3482aa113224b811f5fa34e6cc7dc2a11a83f8b0d57f3 WHIRLPOOL 414d689931d80b20a284190586b55d1ae7a278461864b8c8dd836e4a97f2a7659378365a8c8d9fad72e5c6e02db9f1d35ef96cf6d378cbd2e1af837aee8db114
diff --git a/media-tv/p2pvr/p2pvr-842.ebuild b/media-tv/p2pvr/p2pvr-915.ebuild
index 3fb9eae..7ae3480 100644
--- a/media-tv/p2pvr/p2pvr-842.ebuild
+++ b/media-tv/p2pvr/p2pvr-915.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
 EAPI=5
 
+inherit user
+
 DESCRIPTION="Project2 based lightweight PVR"
 HOMEPAGE="http://p2pvr.randomdan.homeip.net"
 
-SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.xz"
+SRC_URI="http://releases.randomdan.homeip.net/download/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x64"
@@ -16,7 +14,7 @@ IUSE=""
 DEPEND="
 	dev-util/boost-build
 	>=dev-libs/Ice-3.5
-	>=www-apps/project2-841[postgres,daemon]
+	>=www-apps/project2-914[postgres,daemon]
 "
 RDEPEND="${DEPEND}"
 
@@ -24,27 +22,35 @@ src_prepare() {
 	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
 }
 
+pkg_preinst() {
+	enewuser p2pvr -1 -1 /etc/p2pvr "video"
+}
+
 src_compile() {
 	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
 	cd ${S}/p2pvr || die
 	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} -q \
-			|| die "Compile failed"
+		${BJAM} variant=release ${BJAMOPTS} -q \
+		|| die "Compile failed"
 }
 
 src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
 	cd ${S}/p2pvr || die
+
+	dodoc doc/* || die
+	insinto /usr/share/p2pvr/ice || die
+	doins ice/*.ice || die
+	insinto /usr/share/p2pvr/sql || die
+	doins datasources/schema.sql || die
+	doinitd etc/init.d/* || die
+	insinto /etc/p2pvr || die
+	doins etc/p2config || die
+	insinto /etc/p2pvr/datasources || die
+	doins datasources/postgres.xml || die
+
+	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
 	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} -q install \
-			--prefix=${D}/usr \
-			|| die "Installed failed"
-	insinto /usr/share/doc/${PN}
-	dodoc doc/*
-	insinto /usr/share/${PN}/ice
-	doins ice/*.ice
-	insinto /etc/${PN}
-	doins .p2config
-	insinto /etc/${PN}/datasources
-	doins datasources/*.xml
+		${BJAM} variant=release ${BJAMOPTS} -q install \
+		--prefix=${D}/usr \
+		|| die "Installed failed"
 }