Fix dependency on libsdl to include video (opengl and X don't imply it). Thanks Joshua Downer and Enrico Tagliavini in bug #382983.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

6 files changed, 9 insertions, 242 deletions

diff --git a/dev-util/gource/ChangeLog b/dev-util/gource/ChangeLog
index 08fcaa687b98..c6347abe337a 100644
--- a/dev-util/gource/ChangeLog
+++ b/dev-util/gource/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/gource
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/ChangeLog,v 1.19 2012/05/04 17:51:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/ChangeLog,v 1.20 2012/05/12 19:25:31 flameeyes Exp $
+
+  12 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> -gource-0.31.ebuild,
+  -gource-0.32.ebuild, -gource-0.35.ebuild, -gource-0.37.ebuild,
+  gource-0.38.ebuild:
+  Fix dependency on libsdl to include video (opengl and X don't imply it).
+  Thanks Joshua Downer and Enrico Tagliavini in bug #382983.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gource-0.31.ebuild,
   gource-0.32.ebuild, gource-0.35.ebuild, gource-0.37.ebuild,
diff --git a/dev-util/gource/gource-0.31.ebuild b/dev-util/gource/gource-0.31.ebuild
deleted file mode 100644
index 00c1e49e295b..000000000000
--- a/dev-util/gource/gource-0.31.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.31.ebuild,v 1.5 2012/05/04 17:51:44 jdhore Exp $
-
-EAPI=2
-
-inherit versionator
-
-MY_P=${P/_p/-}
-MY_P=${MY_P/_/-}
-MY_DATE=${PV/*_p}
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://code.google.com/p/gource/"
-SRC_URI="http://gource.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.10[opengl,X]
-	>=media-libs/sdl-image-1.2[jpeg,png]
-	dev-libs/libpcre:3
-	>=media-libs/ftgl-2.1.3_rc5
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	media-libs/mesa
-	media-fonts/freefont-ttf
-	>=media-libs/glew-1.5
-	dev-libs/tinyxml[-stl]
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	media-libs/freetype:2
-	"
-
-case ${PV} in
-	*_beta*)
-		my_v=$(get_version_component_range 1-3)
-		my_v=${my_v//_/-}
-		S="${WORKDIR}/${PN}-${my_v}" ;;
-	*)
-		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
-esac
-
-src_configure() {
-	econf --enable-ttf-font-dir=/usr/share/fonts/freefont-ttf/ \
-		--with-tinyxml
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc README ChangeLog THANKS || die "dodoc failed"
-}
diff --git a/dev-util/gource/gource-0.32.ebuild b/dev-util/gource/gource-0.32.ebuild
deleted file mode 100644
index 95121cc11265..000000000000
--- a/dev-util/gource/gource-0.32.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.32.ebuild,v 1.2 2012/05/04 17:51:44 jdhore Exp $
-
-EAPI=2
-
-inherit versionator
-
-MY_P=${P/_p/-}
-MY_P=${MY_P/_/-}
-MY_DATE=${PV/*_p}
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://code.google.com/p/gource/"
-SRC_URI="http://gource.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.10[opengl,X]
-	>=media-libs/sdl-image-1.2[jpeg,png]
-	dev-libs/libpcre:3
-	>=media-libs/ftgl-2.1.3_rc5
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	media-libs/mesa
-	media-fonts/freefont-ttf
-	>=media-libs/glew-1.5
-	dev-libs/tinyxml[-stl]
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	media-libs/freetype:2
-	"
-
-case ${PV} in
-	*_beta*)
-		my_v=$(get_version_component_range 1-3)
-		my_v=${my_v//_/-}
-		S="${WORKDIR}/${PN}-${my_v}" ;;
-	*)
-		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
-esac
-
-src_configure() {
-	econf --enable-ttf-font-dir=/usr/share/fonts/freefont-ttf/ \
-		--with-tinyxml
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc README ChangeLog THANKS || die "dodoc failed"
-}
diff --git a/dev-util/gource/gource-0.35.ebuild b/dev-util/gource/gource-0.35.ebuild
deleted file mode 100644
index 40dcb0773dfd..000000000000
--- a/dev-util/gource/gource-0.35.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.35.ebuild,v 1.2 2012/05/04 17:51:44 jdhore Exp $
-
-EAPI=2
-
-inherit autotools versionator
-
-MY_P=${P/_p/-}
-MY_P=${MY_P/_/-}
-MY_DATE=${PV/*_p}
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://code.google.com/p/gource/"
-SRC_URI="http://gource.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.10[opengl,X]
-	>=media-libs/sdl-image-1.2[jpeg,png]
-	dev-libs/libpcre:3
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	media-libs/mesa
-	media-fonts/freefont-ttf
-	>=media-libs/glew-1.5
-	dev-libs/tinyxml[-stl]
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	media-libs/freetype:2
-	"
-
-case ${PV} in
-	*_beta*)
-		my_v=$(get_version_component_range 1-3)
-		my_v=${my_v//_/-}
-		S="${WORKDIR}/${PN}-${my_v}" ;;
-	*)
-		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
-esac
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-ttf-font-dir=/usr/share/fonts/freefont-ttf/ \
-		--with-tinyxml
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc README ChangeLog THANKS || die "dodoc failed"
-}
diff --git a/dev-util/gource/gource-0.37.ebuild b/dev-util/gource/gource-0.37.ebuild
deleted file mode 100644
index 5047117ba7f0..000000000000
--- a/dev-util/gource/gource-0.37.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.37.ebuild,v 1.2 2012/05/04 17:51:44 jdhore Exp $
-
-EAPI=2
-
-inherit autotools flag-o-matic versionator
-
-MY_P=${P/_p/-}
-MY_P=${MY_P/_/-}
-MY_DATE=${PV/*_p}
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://code.google.com/p/gource/"
-SRC_URI="http://gource.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.10[opengl,X]
-	>=media-libs/sdl-image-1.2[jpeg,png]
-	dev-libs/libpcre:3
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	media-libs/mesa
-	media-fonts/freefont-ttf
-	>=media-libs/glew-1.5
-	dev-libs/tinyxml
-	"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	media-libs/freetype:2
-	"
-
-case ${PV} in
-	*_beta*)
-		my_v=$(get_version_component_range 1-3)
-		my_v=${my_v//_/-}
-		S="${WORKDIR}/${PN}-${my_v}" ;;
-	*)
-		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
-esac
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# workaround to fix bug #386525
-	# this enable gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cxxflags -DTIXML_USE_STL;
-	fi
-	econf --enable-ttf-font-dir=/usr/share/fonts/freefont-ttf/ \
-		--with-tinyxml
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc README ChangeLog THANKS || die "dodoc failed"
-}
diff --git a/dev-util/gource/gource-0.38.ebuild b/dev-util/gource/gource-0.38.ebuild
index d51b005620e5..3152737ba3b1 100644
--- a/dev-util/gource/gource-0.38.ebuild
+++ b/dev-util/gource/gource-0.38.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/dev-util/gource/gource-0.38.ebuild,v 1.2 2012/05/04 17:51:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.38.ebuild,v 1.3 2012/05/12 19:25:31 flameeyes Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=media-libs/libsdl-1.2.10[opengl,X]
+	>=media-libs/libsdl-1.2.10[video,opengl,X]
 	>=media-libs/sdl-image-1.2[jpeg,png]
 	dev-libs/libpcre:3
 	>=media-libs/libpng-1.2