Revision bump to force rebuild with modified call to sed wrt #320837 by Cédric Jeanneret.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 80 insertions, 13 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 8d04f7fdebbc..35856245d4b6 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.63 2010/05/20 17:32:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.64 2010/05/21 14:19:30 ssuominen Exp $
+
+*gd-2.0.35-r2 (21 May 2010)
+
+  21 May 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild,
+  +gd-2.0.35-r2.ebuild:
+  Revision bump to force rebuild with modified call to sed wrt #320837 by
+  Cédric Jeanneret.
 
   20 May 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild:
   Try libpng14-config and -lpng14 before falling back to libpng-config and
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 3caccbfdee5f..28618cc6088a 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,6 +1,7 @@
 AUX gd-2.0.35-libpng14.patch 331 RMD160 109e44c20a8fb776f0b524802b0e932cfc85183c SHA1 aa41ec05d7a83b3e490f255024ace59801c81d0a SHA256 8558e5638f3762e5c416645683af63e5ad86ceb9dad747fcd6543ff50427b384
 AUX gd-2.0.35-maxcolors.patch 414 RMD160 6a6cefb35a49d69b8739d7406a909aa67f3a9904 SHA1 14c395c21e7ece6f182603774a1d65979c9eb10a SHA256 022a650d6d2e03281b94bf6665b0084c79d75ab499b7266c7d2cf620b260a15b
 DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
-EBUILD gd-2.0.35-r1.ebuild 1415 RMD160 0c9def311c2245e151bcb7d1f64839657ed38f9e SHA1 100b384ae114bfd9d943bdfd2e1a5a5ca9e7eb86 SHA256 f9fcee82cfe8059de8bfd679af98f5c8e5659ed588606f746e15eff3311108a3
-MISC ChangeLog 13715 RMD160 53c10344cf5a9c8ff674892bdea4712dbf635e2d SHA1 05fea9397251b58db76196aa3b3d13378bf89a51 SHA256 a2fad10f75fb181f9058c96a1b9a90d20b5932ad92f35b64296e19b7b18770dc
+EBUILD gd-2.0.35-r1.ebuild 1256 RMD160 bd45b010fb20888960f0d5e139d29ab5cc8eb7b1 SHA1 eaa9f7426ee37d41d4e7f2aebb50bc3efb61147e SHA256 a913f4abc971514e4255da0bbf4d0b034b1010f85f1b12311503fb3aaa72e27d
+EBUILD gd-2.0.35-r2.ebuild 1377 RMD160 acf558ace273e5241b9bbdab0553696a568eecb4 SHA1 c93885f049f3e041e73718dfaf33b722c03d8eb8 SHA256 67df5b060de143e35adfe51797f87122d1ea14c9158d266e46f7a67d2a75eb7e
+MISC ChangeLog 13939 RMD160 e3f0f9563783f6b18e59bec4ecdecaf43866a684 SHA1 fd795ac6a86c610ff8d26a0ba8bc1b2e46cf95cd SHA256 5c078fce1a21f7647f4c37c461c709efc052ad93f14fe52753bba621700d9912
 MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843
diff --git a/media-libs/gd/gd-2.0.35-r1.ebuild b/media-libs/gd/gd-2.0.35-r1.ebuild
index 190f3ccb1a41..b028f1371eb8 100644
--- a/media-libs/gd/gd-2.0.35-r1.ebuild
+++ b/media-libs/gd/gd-2.0.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.11 2010/05/21 10:34:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.12 2010/05/21 14:19:30 ssuominen Exp $
 
 EAPI=1
 inherit autotools
@@ -28,12 +28,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-libpng14.patch \
 		"${FILESDIR}"/${P}-maxcolors.patch
 
-	# Try libpng14 first, then fallback to plain libpng
-	sed -i \
-		-e 's/libpng12-config/libpng14-config/g' \
-		-e 's/-lpng12/-lpng14/' \
-		configure.ac || die
-
 	eautoconf
 	find . -type f -print0 | xargs -0 touch -r configure
 }
diff --git a/media-libs/gd/gd-2.0.35-r2.ebuild b/media-libs/gd/gd-2.0.35-r2.ebuild
new file mode 100644
index 000000000000..c30ba582e9f3
--- /dev/null
+++ b/media-libs/gd/gd-2.0.35-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r2.ebuild,v 1.1 2010/05/21 14:19:30 ssuominen Exp $
+
+EAPI=1
+inherit autotools
+
+DESCRIPTION="A graphics library for fast image creation"
+HOMEPAGE="http://libgd.org/"
+SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
+
+LICENSE="|| ( as-is BSD )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="fontconfig jpeg png truetype xpm"
+
+RDEPEND="fontconfig? ( media-libs/fontconfig )
+	jpeg? ( >=media-libs/jpeg-6b:0 )
+	png? ( >=media-libs/libpng-1.2.43-r2:0
+		sys-libs/zlib )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	xpm? ( x11-libs/libXpm x11-libs/libXt )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-maxcolors.patch
+
+	# Try libpng14 first, then fallback to plain libpng
+	sed -i \
+		-e 's:png12:png14:' \
+		configure.ac || die
+
+	eautoconf
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_compile() {
+	econf \
+		$(use_with fontconfig) \
+		$(use_with png) \
+		$(use_with truetype freetype) \
+		$(use_with jpeg) \
+		$(use_with xpm) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc INSTALL README*
+	dohtml -r ./
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index c6500b8c9182..43f3a1daad50 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gstreamer-0.10.24.tar.bz2 2982027 RMD160 f77e4d1585567c0e4dd61c1301ba2032b2a04177 SHA1 bb93174f1c19560e119092a16e8acc3a905b6bb4 SHA256 ee8e22ff368333e668904133b40622702a1c687872e8ee5e06df9a5aad71963c
 DIST gstreamer-0.10.25.tar.bz2 3045572 RMD160 79f0d117f46d4138acb35fac6594a7aeba4c4a7e SHA1 e3cda2dcac9dbbfc2e61ba79fcd3bff1313dc7f4 SHA256 39b2ba7b3bfa8df6d998a9461e7091c27757e36a53e93969d7d9982a56526578
 DIST gstreamer-0.10.28.tar.bz2 3165971 RMD160 511ef38706447740803912de47c534fd291915cf SHA1 a1123d60c35c9be1f6f6357176056361f42e896b SHA256 61613ec7574d22230e8cc893f91b66faec6b21288a22d2f21c9d9eeb7667eb2c
 EBUILD gstreamer-0.10.24.ebuild 1532 RMD160 09c959861d6b2770a2327f6871981d6ff2c408c7 SHA1 75e94d7b44bd88a2eadc44a39f3bd7f9b5f1ff43 SHA256 26e4cca78e0ebc71f569e37adf88d4ff7c0162cd8e4a5fa27ba7ce10e13927dc
-EBUILD gstreamer-0.10.25.ebuild 1581 RMD160 4ae406fb69d90dfe23f03580f56eb0052f54f18c SHA1 5e9395bd85262dfbf781477ccea5b4a1cfbbb512 SHA256 b2ab8362b93fe30ca19ea7ecbab3ec5f471e6b862f79705cd23ab1d801c797fe
-EBUILD gstreamer-0.10.28.ebuild 1746 RMD160 e0a302ed77f40f970dbba13d7744020d4244b859 SHA1 401bd056d3c186768949d67744f652a7785f7003 SHA256 4ac2505ec1d66956a0e05f813b9503999afb52a086761f1f063ca775abebc343
-MISC ChangeLog 33215 RMD160 8b77d16895382294d398afd6a4b4d50eb44af01e SHA1 97926a7125c7d5819d11ecfee6616fb70b9713de SHA256 e36a0e078c27ac85f5afe1ba48400b30adced94505f3451a0c906e3019160811
+EBUILD gstreamer-0.10.25.ebuild 1557 RMD160 09bb871e556f0a64fc7a817a5f520dade3de2f6b SHA1 4979bb5031c458acd6c9108b49e16674a53efc88 SHA256 56cb86b3e949f7fbca2ad1ce92f0bf6dbafaba288ba17fde77928542709182c8
+EBUILD gstreamer-0.10.28.ebuild 1724 RMD160 1bc5349439291478c24d87a8047d02bbc8aac146 SHA1 bcb70bc9d1a0f4b7562f72ce898978a0936fa655 SHA256 0655c1a9de00dc2ab7389dac94929a8f12afbf32420c645b881b1144935a59f7
+MISC ChangeLog 33388 RMD160 b873e2594a93e26ccd46acdddc179d577e146f43 SHA1 5578c39196d5c101f5500d1c2cc7492620febd98 SHA256 dc55a29784daa62b6b51303e3969457252c6fb68356e88fad586d77955470557
 MISC metadata.xml 183 RMD160 1ff3457acfc2fe0f859b9cc5879b3093b2979fe9 SHA1 829dff00498fcdadd7e4f172770790cf601450b2 SHA256 d204aaee1ef1b7f278926aeadf0958d8b6a81affb746a3924a565263a97022fc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv2lwwACgkQmOfEJZHYOKf5FQCgh0R+5T9wpMtiSZVDAqcKKDcM
+DMEAnROb/QZzGcUpTXYgUJzDIhkcXoMY
+=rBkx
+-----END PGP SIGNATURE-----