Revbump and remove old. Remove reference manual install.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 21 insertions, 44 deletions

diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index 8081fde3605e..342ab07ffed6 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/csound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.13 2012/04/11 22:27:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.14 2012/04/11 22:32:07 radhermit Exp $
+
+*csound-5.17.2-r1 (11 Apr 2012)
+
+  11 Apr 2012; Tim Harder <radhermit@gentoo.org> -csound-5.17.2.ebuild,
+  +csound-5.17.2-r1.ebuild, metadata.xml:
+  Revbump and remove old. Remove reference manual install.
 
 *csound-5.17.6 (11 Apr 2012)
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 78bd7719d36b..76e7776f1757 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -6,22 +6,18 @@ AUX csound-5.16.6-tests.patch 2356 RMD160 6b3d93e4e062d009b7776ece4cf9c39a7da7ac
 AUX csound-5.17.2-scons.patch 13382 RMD160 1d98fdbb0333dd405c44264b2cbf6b5e39f9dd3a SHA1 a68c0f862d94f1183cce3d1aa297df526e2642a9 SHA256 e9425100c7fd9bee73e7c8aeb1a6b17dffda4161769bda90cc9fc02c3567712b
 DIST Csound5.17.2.tar.gz 8777963 RMD160 79bb854e722c049afd4a2e048b2332223c2a0f97 SHA1 717233f40fe516a955b9caf2ddad3b5c85634b36 SHA256 b46c7efc23831b2c611b0f77d2222a8d0055eee094d92ac3fb7eb1aa969003bb
 DIST Csound5.17.6.tar.gz 9132954 RMD160 8b42227b149664bb0c72713818d67018bbe428ee SHA1 ee1e999e51dc3377b9409cd43cd84ce32f3bf1c8 SHA256 d161acddb4a419fc15097e4f508b7b4e09fadb25b72906cf4f485ca9415fe6d1
-DIST Csound5.17_manual-fr_html.zip 9881142 RMD160 089a4fa7bbcd194494f9a20f10166b4f05c8af59 SHA1 a170cf2f3009ac6055bcc91e9104d33146c286c2 SHA256 9c2a6639ee733329269f1474a60e0233aded2b9f11d1f183fd9602fc38d301f5
-DIST Csound5.17_manual-fr_pdf.zip 6044660 RMD160 44a188bcaf70afba2e9e884460348aa6a6e50fad SHA1 2ef4ee6ce503d40ddc9f6afb9104fce66d28cc47 SHA256 03033ef48e570c89b6a2b4c70c1c29e379f5d09d0f5d98a24fe5bf1ee559164a
-DIST Csound5.17_manual_html.zip 9621312 RMD160 fbd6d343dbbe6787e10b3abbc35011713db27cea SHA1 20c22f73abc5b4a72956881d5cbde1587d853a31 SHA256 cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626
-DIST Csound5.17_manual_pdf.zip 5736239 RMD160 469f7a1df1ef33b17bc3de169123c4842e30994a SHA1 e27d16ed45e7a9b40d129d8b32411775faff5e29 SHA256 72d3e416b1e2fa7d60d67f803083f86ec12a09a4af427713a5a6a10472f95ee8
-EBUILD csound-5.17.2.ebuild 5978 RMD160 0bb7d35e532306e2989f615adb71529df53071ce SHA1 770179215186e71d768638b5d4fc97e798e44a48 SHA256 2c7a2bc5d14d85dd0d62a5ae3e53a7fabb17f68fc63c5e10a7aa9ab3bda69fbe
+EBUILD csound-5.17.2-r1.ebuild 5347 RMD160 737073bbaf5b04920b80458b3ce24d66e1343933 SHA1 f88471c6c9d02581f9370e19c896da8e39e4807b SHA256 dff64cd4aea79f89ec929214dbfc9d98b9a6206ab7c66c3af6023190cc125b4c
 EBUILD csound-5.17.6.ebuild 5308 RMD160 d42507be4c8666ffe542cd03e7cdd91b384203f1 SHA1 e5bc2a31741205edd34604ed53c8e73275c1601f SHA256 7632741f856ae3c85239bf30783cc7c35703babb0d9050ca702d3fb71765a125
-MISC ChangeLog 2265 RMD160 eda4e0a6b1874a718c93533de83b9ad95bcff3d4 SHA1 3f9365692a4776da362465111e8b6ebd7e2f9307 SHA256 3bd224188e7e4c2ec744fa25293163eaf4b462e2acbf9fa7a3faf8aa98096662
-MISC metadata.xml 1542 RMD160 66c42128d2804adaf637a42aee0c4893e6ed52a6 SHA1 42307af3bd5bfd5a994d828eb56a9a357b40fd31 SHA256 d889b4005dc6559b83b68ba6b19f9c4c34690e3d6ac8931da93ea00dd57340a6
+MISC ChangeLog 2472 RMD160 4f4f5eef9976ba64ae641942fdbb1387b08ffc3e SHA1 7143c8dfc445fb582175a112c30f81ea68cb957e SHA256 5a12e580cedf8c5f0e11c72ebf0db710947068075528fd2c7ced596730cfd5cd
+MISC metadata.xml 1412 RMD160 c6e0d21b6e3be750430852d3814414fc4ce4c109 SHA1 c99d16c25cd572e31aeccf34261f36c84502cf84 SHA256 3bf65b3bc701d6e4f28b9074673e81914fa637c6b430b31b8d5cf3f191a3fb41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPhgVkAAoJEEqz6FtPBkyjncEH/RbSNf9L0DdRHX3RhC61o3fe
-Rf8iM8QQ0SbfzmvIX54fRzPuXrZ1OgkIGPfzTIxkDcEkJZF1MzbZUyY6XE921dkt
-76rkqmIdXpaTz+Dy21jgoC+jutOUyDJND4vlAiVnizbFKH4TXxi4qbr34nICktGa
-JVjLuK3teDNdp/ig1eYZgsx0C/GI+V9ocbz+AkPv3R2FuebzdcsKgXseRdPyYYcq
-EgixcwGnZoeBf+vGeByxr9iF2Tjkzx7GubmTmeVt1kHBMIbNxO1l8KMKuTe7RzqF
-7yVqofe5tbazQdvH7nalJZq+W5zbCt4pKMVCleai49wSqT4PGZId/oNkFmsg6KI=
-=xUKZ
+iQEcBAEBCgAGBQJPhgZwAAoJEEqz6FtPBkyjipYH/jvFi+J7LPxw5ItV/7JB71W5
+56xnl+i/y7grFuPhPuJ/5ZuyLL/NdX46gzaGQ+VSN/hDe3RSvIa6CCKr0Cnh48MO
+nk2Sbc6M4CKRZrcj4rR3aB6qsII4IsHP3qpGu8SuTkcccBPpDh+HtrfPR7npkdOq
+Gq4k+Yzj+x/haV9puyQIsmxe/eUjPKwzA/l4l31iKw8DwKdgMxTEH8nIdbvA2/HS
+o5vRHBmEOqj2f5YtTyECWPZ8VYU+/z9nZCfHQFONrO0Xx6XwqNv+heHfO/iiu5Jd
+Y8w32mQ5cHec6GMG346R/UuWEziopmF7OSN52Blp8mFnuC3Hv8Sw5cSlmLDnCpE=
+=fTVN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.17.2.ebuild b/media-sound/csound/csound-5.17.2-r1.ebuild
index 2f802fce9d77..bb78e8a4ba81 100644
--- a/media-sound/csound/csound-5.17.2.ebuild
+++ b/media-sound/csound/csound-5.17.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.2.ebuild,v 1.1 2012/03/22 01:08:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.2-r1.ebuild,v 1.1 2012/04/11 22:32:10 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -9,25 +9,16 @@ inherit eutils multilib python java-pkg-opt-2 scons-utils toolchain-funcs versio
 
 MY_PN="${PN/c/C}"
 MY_P="${MY_PN}${PV}"
-DOCS_P="${MY_PN}$(get_version_component_range 1-2)"
 
 DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
 HOMEPAGE="http://csounds.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	html? (
-		linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual-fr_html.zip )
-		!linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual_html.zip )
-	)
-	doc? (
-		linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual-fr_pdf.zip )
-		!linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual_pdf.zip )
-	)"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac +cxx debug doc double-precision dssi examples fltk +fluidsynth
-html +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
+IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
++image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
 python samples static-libs stk tcl test +threads +utils vim-syntax vst"
 
 LANGS=" de en_GB en_US es_CO fr it ro ru"
@@ -67,8 +58,6 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 	chua? ( dev-libs/boost )
 	csoundac? ( dev-lang/swig )
-	html? ( app-arch/unzip )
-	doc? ( app-arch/unzip )
 	nls? ( sys-devel/gettext )
 	test? ( =dev-lang/python-2* )
 	vst? ( dev-lang/swig )"
@@ -194,17 +183,5 @@ src_install() {
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
-	if use html ; then
-		dohtml -r "${WORKDIR}"/html/*
-	fi
-
-	if use doc ; then
-		if use linguas_fr ; then
-			dodoc "${WORKDIR}"/${DOCS_P}_manual-fr.pdf
-		else
-			dodoc "${WORKDIR}"/${DOCS_P}_manual.pdf
-		fi
-	fi
-
 	use samples && dodoc -r samples
 }
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 9f6276f26632..539a9f1945ab 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -10,11 +10,9 @@
 		<flag name="beats">Build the beats score frontend</flag>
 		<flag name="chua">Build the chua opcodes</flag>
 		<flag name="csoundac">Build the CsoundAC extension module</flag>
-		<flag name="doc">Install the pdf version of the manual</flag>
 		<flag name="double-precision">Use double-precision floating point for audio samples</flag>
 		<flag name="dssi">Build the DSSI opcodes</flag>
 		<flag name="fluidsynth">Build the fluidsynth opcodes</flag>
-		<flag name="html">Install the html version of the manual</flag>
 		<flag name="image">Build the image opcodes</flag>
 		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
 		<flag name="linear">Build the linear algebra Opcodes</flag>