Attachment #370008 for bug #488998





EAPI="5"

inherit gnome.org gnome2-utils multilib libtool multilib-minimal

DESCRIPTION="Image loading library for GTK+"
HOMEPAGE="http://www.gtk.org/"

IUSE="+X debug +introspection jpeg jpeg2k tiff test"

COMMON_DEPEND="
	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
"
DEPEND="${COMMON_DEPEND}
	>=dev-util/gtk-doc-am-1.11

	!<x11-libs/gtk+-2.90.4:3
"

MULTILIB_CHOST_TOOLS=(
	/usr/bin/gdk-pixbuf-query-loaders
)

src_prepare() {
	# This will avoid polluting the pkg-config file with versioned libpng,
	# which is causing problems with libpng14 -> libpng15 upgrade

	elibtoolize # for Darwin modules, bug #???
}

multilib_src_configure() {
	# png always on to display icons
	ECONF_SOURCE="${S}" \
	econf \
		$(usex debug --enable-debug=yes "") \
		$(use_with jpeg libjpeg) \
		$(use_with jpeg2k libjasper) \
		$(use_with tiff libtiff) \
		$(multilib_build_binaries \
			&& use_enable introspection \
			|| echo --disable-introspection) \
		$(use_with X x11) \
		--with-libpng
}

multilib_src_install_all() {
	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
	MAKEOPTS+=" -j1" default
	prune_libtool_files --modules

	fi
}

do_update() {
	local GDK_PIXBUF_UPDATE_BIN=/usr/bin/${CHOST}-gdk-pixbuf-query-loaders
	gnome2_gdk_pixbuf_update
}

pkg_postinst() {
	# causes segfault if set, see bug 375615
	unset __GL_NO_DSO_FINALIZER

	multilib_foreach_abi do_update

	# Migration snippet for when this was handled by gtk+
	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then

Return to bug 488998

Lines 4-10 Link Here

(-)gdk-pixbuf-2.30.4.ebuild.orig (-11 / +23 lines)
4		4
5	EAPI="5"	5	EAPI="5"
6		6
7	inherit gnome.org gnome2-utils multilib libtool	7	inherit gnome.org gnome2-utils multilib libtool multilib-minimal
8		8
9	DESCRIPTION="Image loading library for GTK+"	9	DESCRIPTION="Image loading library for GTK+"
10	HOMEPAGE="http://www.gtk.org/"	10	HOMEPAGE="http://www.gtk.org/"
Lines 15-27 Link Here
15	IUSE="+X debug +introspection jpeg jpeg2k tiff test"	15	IUSE="+X debug +introspection jpeg jpeg2k tiff test"
16		16
17	COMMON_DEPEND="	17	COMMON_DEPEND="
18	>=dev-libs/glib-2.37.6:2	18	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
19	>=media-libs/libpng-1.4:0=	19	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
20	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )	20	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
21	jpeg? ( virtual/jpeg:0= )	21	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
22	jpeg2k? ( media-libs/jasper:= )	22	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
23	tiff? ( >=media-libs/tiff-3.9.2:0= )	23	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
24	X? ( x11-libs/libX11 )	24	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
25	"	25	"
26	DEPEND="${COMMON_DEPEND}	26	DEPEND="${COMMON_DEPEND}
27	>=dev-util/gtk-doc-am-1.11	27	>=dev-util/gtk-doc-am-1.11
Lines 36-41 Link Here
36	!<x11-libs/gtk+-2.90.4:3	36	!<x11-libs/gtk+-2.90.4:3
37	"	37	"
38		38
		39	MULTILIB_CHOST_TOOLS=(
		40	/usr/bin/gdk-pixbuf-query-loaders
		41	)
		42
39	src_prepare() {	43	src_prepare() {
40	# This will avoid polluting the pkg-config file with versioned libpng,	44	# This will avoid polluting the pkg-config file with versioned libpng,
41	# which is causing problems with libpng14 -> libpng15 upgrade	45	# which is causing problems with libpng14 -> libpng15 upgrade
Lines 48-66 Link Here
48	elibtoolize # for Darwin modules, bug #???	52	elibtoolize # for Darwin modules, bug #???
49	}	53	}
50		54
51	src_configure() {	55	multilib_src_configure() {
52	# png always on to display icons	56	# png always on to display icons
		57	ECONF_SOURCE="${S}" \
53	econf \	58	econf \
54	$(usex debug --enable-debug=yes "") \	59	$(usex debug --enable-debug=yes "") \
55	$(use_with jpeg libjpeg) \	60	$(use_with jpeg libjpeg) \
56	$(use_with jpeg2k libjasper) \	61	$(use_with jpeg2k libjasper) \
57	$(use_with tiff libtiff) \	62	$(use_with tiff libtiff) \
58	$(use_enable introspection) \	63	$(multilib_build_binaries \
		64	&& use_enable introspection \
		65	\|\| echo --disable-introspection) \
59	$(use_with X x11) \	66	$(use_with X x11) \
60	--with-libpng	67	--with-libpng
61	}	68	}
62		69
63	src_install() {	70	multilib_src_install_all() {
64	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372	71	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
65	MAKEOPTS+=" -j1" default	72	MAKEOPTS+=" -j1" default
66	prune_libtool_files --modules	73	prune_libtool_files --modules
Lines 79-89 Link Here
79	fi	86	fi
80	}	87	}
81		88
		89	do_update() {
		90	local GDK_PIXBUF_UPDATE_BIN=/usr/bin/${CHOST}-gdk-pixbuf-query-loaders
		91	gnome2_gdk_pixbuf_update
		92	}
		93
82	pkg_postinst() {	94	pkg_postinst() {
83	# causes segfault if set, see bug 375615	95	# causes segfault if set, see bug 375615
84	unset __GL_NO_DSO_FINALIZER	96	unset __GL_NO_DSO_FINALIZER
85		97
86	gnome2_gdk_pixbuf_update	98	multilib_foreach_abi do_update
87		99
88	# Migration snippet for when this was handled by gtk+	100	# Migration snippet for when this was handled by gtk+
89	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then	101	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then