[gentoo-commits] gentoo-x86 commit in media-libs/libzen: ChangeLog libzen-0.4.24.ebuild libzen-0.4.23.ebuild

[Tim Harder (radhermit)]

radhermit    12/02/05 04:44:49

  Modified:             ChangeLog libzen-0.4.24.ebuild libzen-0.4.23.ebuild
  Log:
  Revert to autotools eclass to fix broken reconfigure deps (bug #402219).
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.33                 media-libs/libzen/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	5 Feb 2012 02:28:30 -0000	1.32
+++ ChangeLog	5 Feb 2012 04:44:49 -0000	1.33
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libzen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.32 2012/02/05 02:28:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.33 2012/02/05 04:44:49 radhermit Exp $
+
+  05 Feb 2012; Tim Harder <radhermit@g.o> libzen-0.4.23.ebuild,
+  libzen-0.4.24.ebuild:
+  Revert to autotools eclass to fix broken reconfigure deps (bug #402219).
 
   05 Feb 2012; Tim Harder <radhermit@g.o> libzen-0.4.23.ebuild:
   Use autoreconf from autotools-utils eclass for old version too.



1.3                  media-libs/libzen/libzen-0.4.24.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild?r1=1.2&r2=1.3

Index: libzen-0.4.24.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzen-0.4.24.ebuild	5 Feb 2012 02:26:14 -0000	1.2
+++ libzen-0.4.24.ebuild	5 Feb 2012 04:44:49 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild,v 1.2 2012/02/05 02:26:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.24.ebuild,v 1.3 2012/02/05 04:44:49 radhermit Exp $
 
 EAPI="4"
 
-inherit autotools-utils multilib
+inherit autotools multilib
 
 MY_PN="ZenLib"
 DESCRIPTION="Shared library for libmediainfo and mediainfo"
@@ -22,23 +22,20 @@
 
 S="${WORKDIR}/${MY_PN}/Project/GNU/Library"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
 src_prepare() {
 	sed -i -e "s:-O2::" configure.ac
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		--enable-unicode
-	)
-	autotools-utils_src_configure
+	econf \
+		--enable-unicode \
+		--enable-shared \
+		$(use_enable static-libs static)
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	default
 
 	if use doc ; then
 		cd "${WORKDIR}"/${MY_PN}/Source/Doc
@@ -47,10 +44,10 @@
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${AUTOTOOLS_BUILD_DIR}"/${PN}.pc
+	doins ${PN}.pc
 
 	for x in ./ Format/Html Format/Http HTTP_Client ; do
 		insinto /usr/include/${MY_PN}/${x}
@@ -61,4 +58,6 @@
 	if use doc ; then
 		dohtml "${WORKDIR}"/${MY_PN}/Doc/*
 	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }



1.8                  media-libs/libzen/libzen-0.4.23.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild?r1=1.7&r2=1.8

Index: libzen-0.4.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libzen-0.4.23.ebuild	5 Feb 2012 02:28:30 -0000	1.7
+++ libzen-0.4.23.ebuild	5 Feb 2012 04:44:49 -0000	1.8
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.7 2012/02/05 02:28:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.8 2012/02/05 04:44:49 radhermit Exp $
 
 EAPI="4"
 
-inherit autotools-utils multilib
+inherit eutils autotools multilib
 
 MY_PN="ZenLib"
 DESCRIPTION="Shared library for libmediainfo and mediainfo"
@@ -22,27 +22,21 @@
 
 S="${WORKDIR}/${MY_PN}/Project/GNU/Library"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
-)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
 	sed -i -e "s:-O2::" configure.ac
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		--enable-unicode
-	)
-	autotools-utils_src_configure
+	econf \
+		--enable-unicode \
+		--enable-shared \
+		$(use_enable static-libs static)
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	default
 
 	if use doc ; then
 		cd "${WORKDIR}"/${MY_PN}/Source/Doc
@@ -51,10 +45,10 @@
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${AUTOTOOLS_BUILD_DIR}"/${PN}.pc
+	doins ${PN}.pc
 
 	for x in ./ Base64 Format/Html Format/Http HTTP_Client ; do
 		insinto /usr/include/${MY_PN}/${x}
@@ -65,4 +59,6 @@
 	if use doc ; then
 		dohtml "${WORKDIR}"/${MY_PN}/Doc/*
 	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }