dev-libs/mini-xml: Don't prestrip, #426696; handle static-lisb, docs...

(Portage version: 2.2.0_alpha119/cvs/Linux x86_64)

5 files changed, 87 insertions, 16 deletions

diff --git a/dev-libs/mini-xml/ChangeLog b/dev-libs/mini-xml/ChangeLog
index b4fda6f261ea..f71e5a571e5b 100644
--- a/dev-libs/mini-xml/ChangeLog
+++ b/dev-libs/mini-xml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/mini-xml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/ChangeLog,v 1.19 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/ChangeLog,v 1.20 2012/07/18 11:09:42 jlec Exp $
+
+  18 Jul 2012; Justin Lecher <jlec@gentoo.org> mini-xml-2.2.1.ebuild,
+  +files/mini-xml-2.2.1-nostrip-flags.patch, mini-xml-2.6.ebuild, metadata.xml:
+  Don't prestrip, #426696; handle static-lisb, docs...
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> mini-xml-2.6.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-libs/mini-xml/files/mini-xml-2.2.1-nostrip-flags.patch b/dev-libs/mini-xml/files/mini-xml-2.2.1-nostrip-flags.patch
new file mode 100644
index 000000000000..62ce6cb79801
--- /dev/null
+++ b/dev-libs/mini-xml/files/mini-xml-2.2.1-nostrip-flags.patch
@@ -0,0 +1,51 @@
+ Makefile.in |    2 +-
+ configure   |    8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 11908cd..cf34df0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -67,7 +67,7 @@ MAN3EXT		=	@MAN3EXT@
+ # Install commands...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
+ INSTALL_DATA	=	$(INSTALL) -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+ INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
+diff --git a/configure b/configure
+index da3cca7..77a6e90 100755
+--- a/configure
++++ b/configure
+@@ -1280,7 +1280,7 @@ CFLAGS="${CFLAGS:=}"
+ CXXFLAGS="${CXXFLAGS:=}"
+ LDFLAGS="${LDFLAGS:=}"
+ 
+-OPTIM="-O"
++OPTIM=""
+ 
+ 
+ 
+@@ -1296,9 +1296,9 @@ fi;
+ if test "${enable_debug+set}" = set; then
+   enableval="$enable_debug"
+   if eval "test x$enable_debug = xyes"; then
+- 	OPTIM="-g"
++ 	OPTIM=""
+ else
+-	LDFLAGS="$LDFLAGS -s"
++	LDFLAGS="$LDFLAGS"
+ fi
+ fi;
+ 
+@@ -3350,7 +3350,7 @@ echo "${ECHO_T}yes" >&6
+ echo "${ECHO_T}yes" >&6
+ 			LIBMXML="libmxml.so.1.0"
+ 			DSO="\$(CC)"
+-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
++			DSOFLAGS="$LDFLAGS $DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
+                         LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
+ 			;;
+ 
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mini-xml/metadata.xml
index d9cd2cad66c2..91f4e72fb544 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/mini-xml/mini-xml-2.2.1.ebuild b/dev-libs/mini-xml/mini-xml-2.2.1.ebuild
index 303a6c04b24c..3c324b07ba2b 100644
--- a/dev-libs/mini-xml/mini-xml-2.2.1.ebuild
+++ b/dev-libs/mini-xml/mini-xml-2.2.1.ebuild
@@ -1,30 +1,46 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.2.1.ebuild,v 1.3 2012/04/23 17:39:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.2.1.ebuild,v 1.4 2012/07/18 11:09:42 jlec Exp $
 
-IUSE=""
+EAPI=4
 
-inherit libtool flag-o-matic
+inherit eutils multilib
 
 MY_P=${P/mini-xml/mxml}
 
-DESCRIPTION="Mini-XML is a small XML parsing library that you can use to read XML and XML-like data files in your application without requiring large non-standard libraries."
+DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
 HOMEPAGE="http://www.easysw.com/~mike/mxml"
 SRC_URI="mirror://easysw/mxml/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
+IUSE="debug doc static-libs"
 
-DEPEND=""
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nostrip-flags.patch
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--libdir="/usr/$(get_libdir)" \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable debug)
+}
 
-src_unpack() {
-	unpack ${A}
+src_test() {
+	emake testmxml
 }
 
 src_install() {
-	make DSTROOT="${D}" install || die "install failed"
-	dodoc ANNOUNCEMENT CHANGES README
+	emake DSTROOT="${D}" install
+
+	if ! use static-libs; then
+		rm -vf "${ED}"/usr/$(get_libdir)/libmxml.a || die
+	fi
+
+	use doc && dohtml doc/*
 }
diff --git a/dev-libs/mini-xml/mini-xml-2.6.ebuild b/dev-libs/mini-xml/mini-xml-2.6.ebuild
index 8495c3089681..f12233ce186f 100644
--- a/dev-libs/mini-xml/mini-xml-2.6.ebuild
+++ b/dev-libs/mini-xml/mini-xml-2.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.6.ebuild,v 1.3 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.6.ebuild,v 1.4 2012/07/18 11:09:42 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit autotools multilib