New version: 2.10.1. Cleaning old ebuilds.

(Portage version: 2.0.51.22-r1)

6 files changed, 163 insertions, 21 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index 40978f9162ad..0a944e007bce 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.82 2005/07/11 23:38:18 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.83 2005/07/19 11:26:11 leonardop Exp $
+
+*libgnomeui-2.10.1 (19 Jul 2005)
+
+  19 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  libgnomeui-2.10.1.ebuild, files/libgnomeui-2.10.1-gentoo.patch:
+  New version. Added 'static' USE flag. Added patch to remove unnecessary
+  esound/audofile checks, and properly implement the 'jpeg' USE flag.
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   libgnomeui-2.10.0.ebuild:
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index 09bcde045cbf..79efaad187d3 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -1,7 +1,8 @@
-MD5 ffcb9cab9748d63cbb564fec4117c859 libgnomeui-2.10.0.ebuild 1152
-MD5 ed514b184f0e086c1e06db1d565d92d1 libgnomeui-2.8.1-r1.ebuild 1154
 MD5 a6a319b42b59df72e30a283ce40f39cb ChangeLog 9164
+MD5 26d63dc193112956f9d3fcf57b766494 libgnomeui-2.10.1.ebuild 1162
+MD5 b30a7f3e0e86a6dbce23a022df770588 .libgnomeui-2.10.1.ebuild.swp 12288
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 ffcb9cab9748d63cbb564fec4117c859 libgnomeui-2.10.0.ebuild 1152
+MD5 176f244e66b8eac4b53a2aa9fa48cce9 files/digest-libgnomeui-2.10.1 71
 MD5 4becd0494324e4349c245e2b95b0f663 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505
-MD5 9826934947d2ada3715a8cd28696047d files/digest-libgnomeui-2.8.1-r1 70
 MD5 de45532214b2589e59dfdafcc4bfaea6 files/digest-libgnomeui-2.10.0 71
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.10.1 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.10.1
new file mode 100644
index 000000000000..6ed8fba15548
--- /dev/null
+++ b/gnome-base/libgnomeui/files/digest-libgnomeui-2.10.1
@@ -0,0 +1 @@
+MD5 bc52006f097017adda8cb90e31743866 libgnomeui-2.10.1.tar.bz2 1705230
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1-r1 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1-r1
deleted file mode 100644
index 6717d48daf4b..000000000000
--- a/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d46a2b34bdfbc1b36464176fa8bef03c libgnomeui-2.8.1.tar.bz2 1456239
diff --git a/gnome-base/libgnomeui/files/libgnomeui-2.10.1-gentoo.patch b/gnome-base/libgnomeui/files/libgnomeui-2.10.1-gentoo.patch
new file mode 100644
index 000000000000..7cf0497907b5
--- /dev/null
+++ b/gnome-base/libgnomeui/files/libgnomeui-2.10.1-gentoo.patch
@@ -0,0 +1,127 @@
+diff -NurdB libgnomeui-2.10.1/configure.in libgnomeui-2.10.1-patched/configure.in
+--- libgnomeui-2.10.1/configure.in	2005-07-04 08:24:56.000000000 -0500
++++ libgnomeui-2.10.1-patched/configure.in	2005-07-19 04:35:38.000000000 -0500
+@@ -17,8 +17,6 @@
+ m4_define([libgnomeui_extraversion], [])
+ 
+ dnl Required versions of other packages
+-m4_define([esound_required_version],         [0.2.26])
+-m4_define([audiofile_required_version],      [0.2.3])
+ m4_define([libgnome_required_version],       [2.0.0])
+ m4_define([libgnomecanvas_required_version], [2.0.0])
+ m4_define([libbonoboui_required_version],    [2.0.0])
+@@ -110,39 +108,27 @@
+ dnl Start of pkg-config checks
+ dnl
+ 
+-dnl We first check for esound and audiofile (which has conditional
+-dnl support built in)
+-dnl
+-SOUND_MODULES="esound >= esound_required_version dnl
+-  audiofile >= audiofile_required_version"
+-PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES], [
+-	AC_DEFINE(HAVE_LIBAUDIOFILE, 1,
+-                  [Define to 1 if you have libaudiofile installed])
+-	AC_DEFINE(HAVE_ESD, 1,
+-                  [Define to 1 if you have libesd installed])
+-	esd_msg=yes
+-],[
+-	SOUND_MODULES=""
+-	esd_msg=no
+-])
+-
+ dnl
+ dnl libjpeg
+ dnl
+-  if test -z "$LIBJPEG"; then
+-    AC_CHECK_LIB(jpeg, jpeg_start_decompress,
+-      [AC_CHECK_HEADER(jpeglib.h,
+-        jpeg_ok=yes,
+-        jpeg_ok=no)],
+-      AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
+-    if test "$jpeg_ok" = yes; then
+-      JPEG='jpeg'; LIBJPEG='-ljpeg'
+-      AC_DEFINE(HAVE_LIBJPEG, 1,
+-                [Define to 1 if you have libjpeg installed])
+-    else
+-     AC_MSG_WARN(*** JPEG thumbnail loader will not be built (jpeg header file not found) ***)
+-    fi
+-  fi
++
++AC_ARG_WITH(libjpeg,  [  --without-libjpeg       build without JPEG support])
++if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
++	AC_CHECK_LIB(jpeg, jpeg_start_decompress,
++		[AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)],
++		AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
++	if test "$jpeg_ok" = yes; then
++		JPEG='jpeg'; LIBJPEG='-ljpeg'
++		AC_DEFINE(HAVE_LIBJPEG, 1, [Define to 1 if you have libjpeg installed])
++	fi
++fi
++
++if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
++	AC_MSG_ERROR([
++*** Checks for JPEG library failed. You can build without it by passing 
++*** --without-libjpeg to configure but the JPEG thumbnail loader will not
++*** be built then.])
++fi
+ 
+ AC_SUBST(LIBJPEG)
+ 
+@@ -264,6 +250,5 @@
+ 
+ AC_OUTPUT
+ echo "configuration:
+-	esd support: ${esd_msg}
+ 	doc build:   ${enable_gtk_doc}
+ "
+diff -NurdB libgnomeui-2.10.1/libgnomeui/gnome-ui-init.c libgnomeui-2.10.1-patched/libgnomeui/gnome-ui-init.c
+--- libgnomeui-2.10.1/libgnomeui/gnome-ui-init.c	2005-06-30 10:42:22.000000000 -0500
++++ libgnomeui-2.10.1-patched/libgnomeui/gnome-ui-init.c	2005-07-19 04:02:19.000000000 -0500
+@@ -94,8 +94,6 @@
+ /* Prototype for a private gnome_stock function */
+ void _gnome_stock_icons_init (void);
+ 
+-#ifdef HAVE_ESD
+-
+ /* Whether to make noises when the user clicks a button, etc.  We cache it
+  * in a boolean rather than querying GConf every time.
+  */
+@@ -104,8 +102,6 @@
+ /* GConf client for monitoring the event sounds option */
+ static GConfClient *gconf_client = NULL;
+ 
+-#endif /* HAVE_ESD */
+-
+ 
+ enum { ARG_DISABLE_CRASH_DIALOG=1, ARG_DISPLAY };
+ 
+@@ -293,7 +289,6 @@
+                 libgnomeui_segv_setup (app, FALSE);
+ }
+ 
+-#ifdef HAVE_ESD
+ static gboolean
+ relay_gnome_signal (GSignalInvocationHint *hint,
+               	     guint n_param_values,
+@@ -498,12 +493,10 @@
+ 
+         use_event_sounds = new_use_event_sounds;
+ }
+-#endif
+ 
+ static void
+ setup_event_listener (void)
+ {
+-#ifdef HAVE_ESD
+         gconf_client = gconf_client_get_default ();
+         if (!gconf_client)
+                 return;
+@@ -525,7 +518,6 @@
+                 initialize_gtk_signal_relay ();
+                 initialize_gnome_signal_relay ();
+ 	 }
+-#endif
+ }
+ 
+ static void
diff --git a/gnome-base/libgnomeui/libgnomeui-2.8.1-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.10.1.ebuild
index 02c8dcc181a6..df21d8878d84 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.8.1-r1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.10.1.ebuild
@@ -1,49 +1,56 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.8.1-r1.ebuild,v 1.7 2005/04/28 09:04:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.10.1.ebuild,v 1.1 2005/07/19 11:26:11 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="User Interface routines for Gnome"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86"
-IUSE="doc jpeg"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg static"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
 	>=x11-libs/pango-1.1.2
 	>=dev-libs/popt-1.5
-	>=media-sound/esound-0.2.26
-	>=media-libs/audiofile-0.2.3
-	>=gnome-base/gconf-1.2
+	>=gnome-base/gconf-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomecanvas-2
 	>=gnome-base/libbonoboui-2
+	>=gnome-base/libglade-2
 	>=gnome-base/gnome-vfs-2.7.3
-	>=gnome-base/gnome-keyring-0.4
+	gnome-base/gnome-keyring
 	jpeg? ( media-libs/jpeg )"
 
-# FIXME : jpeg stuff no switch 
-
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
+	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 PDEPEND="x11-themes/gnome-themes
 	x11-themes/gnome-icon-theme"
 
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
 
-src_unpack() {
+G2CONF="${G2CONF} $(use_enable static) $(use_with jpeg libjpeg)"
 
+src_unpack() {
 	unpack ${A}
-
 	cd ${S}
+
 	# cleanliness is ... (#68698)
 	epatch ${FILESDIR}/${PN}-2.8.0-ditch_ancient_pics.patch
 
-	automake || die
+	# Remove unnecessary esaund/audofile checks and implement the
+	# --without-jpeg switch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 
+	einfo "Running aclocal"
+	aclocal || die "Aclocal failed"
+	einfo "Running autoconf"
+	autoconf || die "Autoconf failed"
+	einfo "Running automake"
+	WANT_AUTOMAKE=1.7 automake || die "Automake failed"
 }