Install manpage (#418163) and optionally documentation. Remove first

version

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 31 insertions, 43 deletions

diff --git a/media-sound/beets/ChangeLog b/media-sound/beets/ChangeLog
index eae949c682ce..7ee35910dfff 100644
--- a/media-sound/beets/ChangeLog
+++ b/media-sound/beets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/beets
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.5 2012/05/29 17:19:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.6 2012/05/29 20:57:12 sochotnicky Exp $
+
+  29 May 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -beets-1.0_beta14.ebuild, beets-1.0_beta14-r1.ebuild:
+  Install manpage (#418163) and optionally documentation. Remove first
+  version
 
   29 May 2012; Jeff Horelick <jdhore@gentoo.org> beets-1.0_beta14-r1.ebuild:
   Keyword ~x86
diff --git a/media-sound/beets/beets-1.0_beta14-r1.ebuild b/media-sound/beets/beets-1.0_beta14-r1.ebuild
index 9c6a685d83d1..53cc8bbbdf5d 100644
--- a/media-sound/beets/beets-1.0_beta14-r1.ebuild
+++ b/media-sound/beets/beets-1.0_beta14-r1.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14-r1.ebuild,v 1.2 2012/05/29 17:19:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14-r1.ebuild,v 1.3 2012/05/29 20:57:12 sochotnicky Exp $
 
 EAPI="4"
 
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
 
-inherit distutils python
+inherit distutils
 
 MY_PV=${PV/_beta/b}
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks."
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
 SRC_URI="http://beets.googlecode.com/files/${PN}-${MY_PV}.tar.gz"
 HOMEPAGE="http://beets.radbox.org/"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="MIT"
-IUSE="chroma lastgenre bpd replaygain web"
+IUSE="chroma doc lastgenre bpd replaygain web"
 
-DEPEND="dev-lang/python[sqlite]
-		dev-python/munkres
+DEPEND="dev-python/munkres
 		dev-python/python-musicbrainz-ngs
 		dev-python/unidecode
 		media-libs/mutagen
@@ -30,26 +31,37 @@ DEPEND="dev-lang/python[sqlite]
 		lastgenre? ( dev-python/pylast )
 		bpd? ( dev-python/bluelet )
 		replaygain? ( media-sound/rgain )
-		web? ( dev-python/flask )"
+		web? ( dev-python/flask )
+		doc? ( dev-python/sphinx )"
 
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	python_src_prepare
+	distutils_src_prepare
 
 	# remove plugins that do not have appropriate dependencies installed
-	for flag in lastgenre bpd web;do
+	for flag in lastgenre bpd web chroma replaygain;do
 		if ! use $flag ; then
 			rm -r beetsplug/$flag* || \
 				die "Unable to remove $flag plugin"
-			sed -i "s:'beetsplug.$flag',::" setup.py || \
-				die "Unable to disable $flag plugin "
 		fi
 	done
 
-	for flag in chroma replaygain;do
+	for flag in lastgenre bpd web;do
 		if ! use $flag ; then
-			rm beetsplug/$flag.py || die "Unable to remove $flag plugin"
+			sed -i "s:'beetsplug.$flag',::" setup.py || \
+				die "Unable to disable $flag plugin "
 		fi
 	done
 }
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_install() {
+	distutils_src_install
+	doman man/beet.1 man/beetsconfig.5
+	use doc && dohtml -r docs/_build/html/
+}
diff --git a/media-sound/beets/beets-1.0_beta14.ebuild b/media-sound/beets/beets-1.0_beta14.ebuild
deleted file mode 100644
index b2c02737f982..000000000000
--- a/media-sound/beets/beets-1.0_beta14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14.ebuild,v 1.3 2012/05/28 23:25:22 jdhore Exp $
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils python
-
-MY_PV=${PV/_beta/b}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks."
-SRC_URI="http://beets.googlecode.com/files/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://beets.radbox.org/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE=""
-
-DEPEND="dev-python/munkres
-		dev-python/python-musicbrainz-ngs
-		dev-python/unidecode
-		media-libs/mutagen"
-
-RDEPEND="${DEPEND}"