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

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

7 files changed, 25 insertions, 252 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/Manifest b/dev-util/gource/Manifest
index ab49b046ec95..314c59ffee50 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,12 +1,18 @@
-DIST gource-0.31.tar.gz 653514 RMD160 4fe41c969b34d2e980d54767d34ebd3fd3151025 SHA1 0317a9d7b76bd6b196ea1982b662c592aaf205cb SHA256 448d38d25f1275ae4992bc6401ebef34866af91f32058c7f3dd63ea22994af3c
-DIST gource-0.32.tar.gz 653504 RMD160 f1b9ae1feb7a4380b17a58988161508eb9d91a3a SHA1 3eb8b030d79c5f63985ccf4a60926fa10540f4c9 SHA256 fda5692e811c37f4601ddff78ffd316a9a2328085038a4695643159b8ba3a7de
-DIST gource-0.35.tar.gz 668033 RMD160 7a6302613b0d15851885a79453c073e3ebab9742 SHA1 f2bc23224cd3e01279a33e3856a6d027560f6509 SHA256 bc138554bab96213df5b6e5625186386d74b543d4317fec97fa65d285c2715d7
-DIST gource-0.37.tar.gz 667053 RMD160 76bbe62693566c61d5bc8324494079b07a07cb02 SHA1 87d88b5cbf312e160e55582f8e187c87b3df097d SHA256 d6c728643ce303a61d48ba6189d8f84c3bbb6bbffb1afba4b881b262ac4d6d0e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gource-0.38.tar.gz 850811 RMD160 bfeb1de7d1d71dd8cb4d2f9e3fa4ecfc43a00191 SHA1 78f8c2064114313851f53b657d12db28abb89fae SHA256 9b250a70c1fbe9383a22673931bbc4ff43d669da5d6c1e18b5b3329ad2154505
-EBUILD gource-0.31.ebuild 1269 RMD160 4fe6ad3c604807e776485c85152673662d3fc48b SHA1 07bd7f99d5aa95b2e9a64b866e72d9c8793f4ede SHA256 11ba26beb14a5cd224ac5269a631f1308de826258482398d57c5fa9df969ffa8
-EBUILD gource-0.32.ebuild 1269 RMD160 6baa0081fa3d8894cb79d16453e91c597ccae0b6 SHA1 83e3f3c82189e31a05b43b7e484b10e8335d7a35 SHA256 2d4c5e7f130e8d914695a9920e3f9e77097bbf143d08c80d61c1ad11502815b0
-EBUILD gource-0.35.ebuild 1282 RMD160 e0832de72356be15c22e263ad6e6a37cc404800b SHA1 b290f9da61d489a41ddaf257c4c6b53a4f1d5cde SHA256 7077dc56636a1d3cbddd0127909739316f0c349c6bdc495153bb009778d658f2
-EBUILD gource-0.37.ebuild 1472 RMD160 9a1f88b7ba2ec341cea8c9ca93d6a31ec967e3a4 SHA1 7b28befeec055ad0db9c2b9c9d4d16ee0d465619 SHA256 5e20226f2cb14df16870455c1bb6ef450091497e26574edd7e1162b03f94492b
-EBUILD gource-0.38.ebuild 1505 RMD160 2ae4e9b77a6aff91eaa00b585cb24d5657f4718c SHA1 bea798acfdf0801b4cc787636098f7d640881df5 SHA256 1cc78363d5d78ee0484b3a39fa139b9a4a21bca230b98d29fec5bba09ce126ed
-MISC ChangeLog 3647 RMD160 07f845dfdfaf919aad003d4d49cac8d3f9f45918 SHA1 607d3cbaec74e731f24475abb2b90301b4df1997 SHA256 8fe79e3d025160f009c8c4e3d75012f32ca2de30fa308e81f927ca7ede4cca2e
+EBUILD gource-0.38.ebuild 1514 RMD160 7a77b058ad9aabee43f540e0cad06326fcedc4cd SHA1 79690a33899d53515317ffe46d079b41e1db4d57 SHA256 9bd63943f546cf10d54cd7fdc54bce76af0b5b38d142a4dec0357f18aed57305
+MISC ChangeLog 3951 RMD160 d0e5dc55afa6b38aac9c5f2996cbff6dc2883c4f SHA1 cc905ee0d5adf1858bdf1ff3fceb3f12d7295aa1 SHA256 335beebf1b076c77431827a51e3ffec7ddf87c652f6ba6bb4a03148fe16786cc
 MISC metadata.xml 440 RMD160 a791939eca8d4f034721d329e9c38519523c6552 SHA1 1bf0562b36405f839893e1490f59bf65c9c1aad1 SHA256 c119de813f8334e9959fb4b1e742698eaa51dbd77870cb2a1f41a92d25cfc304
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPrroVAAoJEBzRPIrUMBNChd8H/1owwUkpJUQOxTONhtGasLhc
+NM4IQfhfqdxYhYiH7a0xZHk0IsHtf6J/UcMIuSU8wGjSbqSUnA3PcsrIp822VxIs
+ecckR4sAUe2JrHQkSyyr+maMKmJQibLNX123ov7kKZ24I614G4XtxI3Qg+VGt3kU
+8ipLmSN9mHcmOrTJzPJESp3KguqUrZm4Cgmhd9gxxE9c6JhnUvvOfjP3sEwJH/+r
+++wATDXtNrRZksJDxLFbrFJ6+qltReuxdblxuNVZvf6sb7+EZ0f2M9UfjmqBy7UO
+fajPIQX4YfleszLUGL5f9CuuoS6+kFqBnPc1kNRY0cXHgSRpAUwxdzylnTRuRpE=
+=qDuf
+-----END PGP SIGNATURE-----
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