Version bump with bugfixes and translation updates, remove old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 60 insertions, 84 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index 57aba2fae0ea..622ec0929cee 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.253 2010/10/17 14:50:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.254 2010/12/04 00:18:38 pacho Exp $
+
+*libwnck-2.30.6 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/libwnck-2.26.2-fix-glib-mkenums.diff, -libwnck-2.28.0.ebuild,
+  +libwnck-2.30.6.ebuild:
+  Version bump with bugfixes and translation updates, remove old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> libwnck-2.30.2.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/x11-libs/libwnck/files/libwnck-2.26.2-fix-glib-mkenums.diff b/x11-libs/libwnck/files/libwnck-2.26.2-fix-glib-mkenums.diff
deleted file mode 100644
index 1f412a7d58cc..000000000000
--- a/x11-libs/libwnck/files/libwnck-2.26.2-fix-glib-mkenums.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
-index 9b6e8a8..1d3c0d8 100644
---- a/libwnck/Makefile.am
-+++ b/libwnck/Makefile.am
-@@ -129,13 +129,13 @@ wnck-enum-types.c: $(wnck_headers) wnck-enum-types.h
- 	$(AM_V_GEN)glib-mkenums \
- 		--fhead "#include <libwnck/libwnck.h>\n" \
- 		--fprod "\n/* enumerations from \"@filename@\" */" \
--		--vhead "static const GEnumValue _@enum_name@_values[] = {" \
-+		--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
- 		--vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- 		--vtail "  { 0, NULL, NULL }\n};\n\n" \
- 		--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
- 		--vtail "  static GType type = 0;\n\n" \
- 		--vtail "  if (!type)\n" \
--		--vtail "    type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
-+		--vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
- 		--vtail "  return type;\n}\n\n" \
- 		$(wnck_headers) > $@
- 
diff --git a/x11-libs/libwnck/libwnck-2.28.0.ebuild b/x11-libs/libwnck/libwnck-2.28.0.ebuild
deleted file mode 100644
index 87d9492adae8..000000000000
--- a/x11-libs/libwnck/libwnck-2.28.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.28.0.ebuild,v 1.9 2010/08/18 20:59:28 maekke Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools gnome2 eutils
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc startup-notification"
-
-RDEPEND=">=x11-libs/gtk+-2.16.0
-	>=dev-libs/glib-2.16.0
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	dev-util/gtk-doc-am
-	gnome-base/gnome-common
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	x86-interix? (
-		sys-libs/itx-bind
-	)"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable startup-notification)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	# Fix glib-mkenum auto generation (bug #279832)
-	epatch "${FILESDIR}"/${PN}-2.26.2-fix-glib-mkenums.diff
-	# required to force regeneration of wnck-enum-types.h
-	rm libwnck/wnck-enum-types.h
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-
-	# Make it libtool-1 compatible, bug #280876
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	AT_M4DIR="m4" eautoreconf
-}
diff --git a/x11-libs/libwnck/libwnck-2.30.6.ebuild b/x11-libs/libwnck/libwnck-2.30.6.ebuild
new file mode 100644
index 000000000000..85ffef3525ad
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-2.30.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.30.6.ebuild,v 1.1 2010/12/04 00:18:38 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc +introspection startup-notification"
+
+RDEPEND=">=x11-libs/gtk+-2.19.7[introspection?]
+	>=dev-libs/glib-2.16.0
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
+	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	x86-interix? ( sys-libs/itx-bind )"
+# eautoreconf needs
+#	dev-util/gtk-doc-am
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable introspection)
+		$(use_enable startup-notification)"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if use x86-interix; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-ldflags "-L${EPREFIX}/usr/lib/bind"
+	fi
+}