Fix perl installation directory, bug 451190

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

2 files changed, 31 insertions, 16 deletions

diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index c0b480b7fc04..2c87e4da9f47 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gnump3d
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.73 2012/06/09 23:08:40 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.74 2014/12/03 23:32:13 dilfridge Exp $
+
+*gnump3d-3.0-r2 (03 Dec 2014)
+
+  03 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> -gnump3d-3.0.ebuild,
+  +gnump3d-3.0-r2.ebuild:
+  Fix perl installation directory, bug 451190
 
   09 Jun 2012; Zac Medico <zmedico@gentoo.org> gnump3d-3.0-r1.ebuild,
   gnump3d-3.0.ebuild:
diff --git a/media-sound/gnump3d/gnump3d-3.0.ebuild b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
index 8d8f1849e369..ac41275f536b 100644
--- a/media-sound/gnump3d/gnump3d-3.0.ebuild
+++ b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-3.0.ebuild,v 1.10 2012/06/09 23:08:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-3.0-r2.ebuild,v 1.1 2014/12/03 23:32:13 dilfridge Exp $
 
-inherit eutils multilib user
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils multilib user perl-module
 
 DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
 HOMEPAGE="http://www.gnu.org/software/gnump3d/"
@@ -10,12 +13,11 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="sox"
 
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+RDEPEND="sox? ( media-sound/sox )"
+DEPEND="sys-apps/sed"
 
 RESTRICT="test"
 
@@ -27,13 +29,13 @@ pkg_setup() {
 src_compile() { :; }
 
 src_install() {
-	PERLDIR="`perl bin/getlibdir`"
+	perl_set_version
 
-	insinto ${PERLDIR}/gnump3d
+	insinto "${VENDOR_LIB}"/gnump3d
 	doins lib/gnump3d/*.pm
-	insinto ${PERLDIR}/gnump3d/plugins
+	insinto "${VENDOR_LIB}"/gnump3d/plugins
 	doins lib/gnump3d/plugins/*.pm
-	insinto ${PERLDIR}/gnump3d/lang
+	insinto "${VENDOR_LIB}"/gnump3d/lang
 	doins lib/gnump3d/lang/*.pm
 
 	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
@@ -45,8 +47,8 @@ src_install() {
 
 	insinto /etc/gnump3d
 	doins etc/gnump3d.conf etc/mime.types etc/file.types
-	dosed "s,PLUGINDIR,${PERLDIR},g" /etc/gnump3d/gnump3d.conf
-	dosed 's,^user *= *\(.*\)$,user = gnump3d,g' /etc/gnump3d/gnump3d.conf
+	sed -e "s,PLUGINDIR,${VENDOR_LIB},g" -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+	sed -e 's,^user *= *\(.*\)$,user = gnump3d,g' -i "${ED}/etc/gnump3d/gnump3d.conf" || die
 
 	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
 
@@ -62,4 +64,11 @@ src_install() {
 pkg_postinst() {
 	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
 	elog "/etc/init.d/gnump3d start"
+	elog ""
+	elog "At the very least, you will need to change the root directory"
+	elog "where music is found.  By default, gnump3d will also listen"
+	elog "to any address on port 8888"
+	elog ""
+	elog "You can optionally use sox to downmix the quality of streamed"
+	elog "music in realtime for slow connections."
 }