From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-380973-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1R1l1E-0005EZ-Qq
	for garchives@archives.gentoo.org; Thu, 08 Sep 2011 20:16:17 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F3BC421C267;
	Thu,  8 Sep 2011 20:16:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id A76E721C267
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Sep 2011 20:16:03 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 0C3BE66A46
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Sep 2011 20:16:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 127B080042
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Sep 2011 20:16:02 +0000 (UTC)
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" <sping@gentoo.org>
Message-ID: <b3aea6b6f7ed79f48a2aec75a0f04d20cba561dc.sping@gentoo>
Subject: [gentoo-commits] proj/betagarden:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/
X-VCS-Repository: proj/betagarden
X-VCS-Files: x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
X-VCS-Directories: x11-libs/gdk-pixbuf/ x11-libs/gdk-pixbuf/files/
X-VCS-Committer: sping
X-VCS-Committer-Name: Sebastian Pipping
X-VCS-Revision: b3aea6b6f7ed79f48a2aec75a0f04d20cba561dc
Date: Thu,  8 Sep 2011 20:16:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 3e2c051cb4f919f36182e01d50cc2b7d

commit:     b3aea6b6f7ed79f48a2aec75a0f04d20cba561dc
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Sep  8 20:14:23 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 20:15:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi=
t;a=3Dcommit;h=3Db3aea6b6

x11-libs/gdk-pixbuf: 2.23.5 in main tree by now

---
 .../gdk-pixbuf-2.21.4-fix-automagic-x11.patch      |   24 ------
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild       |   81 --------------=
------
 2 files changed, 0 insertions(+), 105 deletions(-)

diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x1=
1.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.p=
atch
deleted file mode 100644
index ae7ec2c..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Adds a new configure option to remove the automagic dependency on libX11=
.
-
---- configure.ac
-+++ configure.ac
-@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES=3D
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=3D
- GDK_PIXBUF_XLIB_EXTRA_LIBS=3D
-=20
--if $PKG_CONFIG --exists x11; then
-+AC_ARG_WITH(x11,
-+            AC_HELP_STRING([--with-x11=3D@<:@no/auto/yes@:>@],
-+                           [build X11 support @<:@default=3Dauto@:>@]),=
,
-+            [
-+              if $PKG_CONFIG --exists x11; then
-+                with_x11=3Dyes
-+              else
-+                with_x11=3Dno
-+              fi
-+            ])
-+
-+if test x$with_x11 =3D xyes; then
-   AM_CONDITIONAL(USE_X11, true)
-   PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
- else

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild b/x11-libs/gdk-=
pixbuf/gdk-pixbuf-2.23.5.ebuild
deleted file mode 100644
index ad59998..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1=
.ebuild,v 1.1 2010/11/08 23:22:59 eva Exp $
-
-EAPI=3D"4"
-
-inherit gnome.org multilib libtool autotools
-
-DESCRIPTION=3D"Image loading library for GTK+"
-HOMEPAGE=3D"http://www.gtk.org/"
-
-LICENSE=3D"LGPL-2"
-SLOT=3D"2"
-KEYWORDS=3D""  # due to copy-bump
-IUSE=3D"+X debug doc +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND=3D"
-	>=3Ddev-libs/glib-2.27.2
-	>=3Dmedia-libs/libpng-1.2.43-r2:0
-	introspection? ( >=3Ddev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=3Dmedia-libs/tiff-3.9.2 )
-	X? ( x11-libs/libX11 )"
-DEPEND=3D"${COMMON_DEPEND}
-	>=3Ddev-util/pkgconfig-0.9
-	>=3Dsys-devel/gettext-0.17
-	>=3Ddev-util/gtk-doc-am-1.11
-	doc? (
-		>=3Ddev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )"
-# librsvg blocker is for the new pixbuf loader API, you lose icons other=
wise
-RDEPEND=3D"${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3"
-
-src_prepare() {
-	# Only build against libX11 if the user wants to do so
-	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
-
-	elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf=3D"
-		$(use_enable doc gtk-doc)
-		$(use_with jpeg libjpeg)
-		$(use_with jpeg2k libjasper)
-		$(use_with tiff libtiff)
-		$(use_enable introspection)
-		$(use_with X x11)
-		--with-libpng"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf=3D"${myconf} --enable-debug=3Dyes"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR=3D"${D}" install || die "Installation failed"
-
-	dodoc AUTHORS NEWS* README* || die "dodoc failed"
-
-	# New library, remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.=
10.0/loaders.cache"
-
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/l=
ib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)=
"
-	fi
-}