[gentoo-commits] gentoo-x86 commit in x11-libs/gtk+extra: ChangeLog gtk+extra-2.1.2.ebuild

["Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>]

ssuominen    10/09/25 19:55:45

  Modified:             ChangeLog gtk+extra-2.1.2.ebuild
  Log:
  rewrite the ebuild too
  
  (Portage version: 2.2_rc86/cvs/Linux x86_64)

Revision  Changes    Path
1.26                 x11-libs/gtk+extra/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+extra/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+extra/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+extra/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	25 Sep 2010 19:30:40 -0000	1.25
+++ ChangeLog	25 Sep 2010 19:55:45 -0000	1.26
@@ -1,13 +1,14 @@
 # ChangeLog for x11-libs/gtk+extra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.25 2010/09/25 19:30:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.26 2010/09/25 19:55:45 ssuominen Exp $
 
   25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   gtk+extra-2.1.2.ebuild, +files/gtk+extra-2.1.2-build.patch,
   +files/gtk+extra-2.1.2-gtk+-2.21.patch,
   +files/gtk+extra-2.1.2-marshal.patch:
   Fix building with make >= 3.82, GTK+ >= 2.21, libtool >= 2.0 and upstream
-  typing errors wrt #333953 by Diego E. Pettenò.
+  typing errors wrt #333953 by Diego E. Pettenò. USE="static-libs" and punt
+  .la files.
 
   27 Mar 2010; Pacho Ramos <pacho@gentoo.org> gtk+extra-2.1.2.ebuild:
   As Samuli noticed again in bug 311611, LICENSE should be FDL-1.1 also



1.5                  x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild?r1=1.4&r2=1.5

Index: gtk+extra-2.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk+extra-2.1.2.ebuild	25 Sep 2010 19:30:40 -0000	1.4
+++ gtk+extra-2.1.2.ebuild	25 Sep 2010 19:55:45 -0000	1.5
@@ -1,11 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.4 2010/09/25 19:30:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.5 2010/09/25 19:55:45 ssuominen Exp $
 
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Useful Additional GTK+ widgets"
 HOMEPAGE="http://gtkextra.sourceforge.net"
@@ -14,24 +12,29 @@
 LICENSE="FDL-1.1 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="x11-libs/gtk+:2
 	dev-libs/glib:2"
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-html-dir=/usr/share/doc/${PF}/html"
-}
+	dev-util/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-marshal.patch \
 		"${FILESDIR}"/${P}-gtk+-2.21.patch
-
 	eautoreconf
-	gnome2_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }