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

Package-Manager: portage-2.2.0_alpha119/cvs/Linux x86_64

6 files changed, 103 insertions, 20 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/Manifest b/dev-libs/mini-xml/Manifest
index e22fa211ebb2..0d97821d757a 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX mini-xml-2.2.1-nostrip-flags.patch 1298 SHA256 98be7b2581df4ad589ba117829de5a2ce1c687def634ed6a3dd33b9387a91962 SHA512 c918c005c2cf252b758ca107c265e4e062db86b56f1b8ef923f62358edf9dcdef7422801e1330057f50c9ca54263bdac43a16aa926e98acd78759f6d02c27f54 WHIRLPOOL dc85de8bf40a3f18e5d7c1a70211828a5fd74701ca93e6d7a5e0f2b90f4dc7a55d322455031b456a2f5bac484da79cb9db99b714708fb157e03665b5ab24bfe4
 DIST mxml-2.2.1.tar.gz 208282 SHA256 cf63024a3f3bff3829a7f484c855b38246ec8350c32354e0dec7a3b38935f17f SHA512 959455c88118e64a2883b760738bd0fc82cc392a561a9aa776a190f319181910b24aee84ba2e6e3abd0a6239d8842981eb94848ae12337707ddcb1bda67365ed WHIRLPOOL 058f3e44ddd3e83ed90d66cd265897b963f3df9f5be0b92b7480ec4991b0302315a9947e2a5c4d01e3c7f1dafa790f5eef69a10eff13f6f2d576382ed406de5b
 DIST mxml-2.6.tar.gz 254455 SHA256 b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795 SHA512 ca66a18a44ad8b6a204ed2130107c73c746fafd7925fd229fed9ba56f4c1654c5d289c08954eb102941d1b2a0c164c1174e169d472b7867c0cb3d0822616219b WHIRLPOOL 96ec16843f333f8661a8515102b75b19bdfa3bec902fe0c0e3d901914b86c5fe50141b291cafcfc81996c5b853d37764e4cb9f1103675ddcf3562819afb583b7
-EBUILD mini-xml-2.2.1.ebuild 779 SHA256 a40ae989f3bf4c06eb9f852320df13ffa7fd148cdad2faa6ccf1f300137cab4c SHA512 4d9407cd44949185950da060288cf5c3d90f6cb79687ad66c34cddf80c9286ad70e8a73dbd08eec3883e3e7d7d350729ff1e572cde14fe1cce1b8eee4ac59a16 WHIRLPOOL 2a1c6d2ad35113a9f82970f778365981a05344a59f647aa2dcd50e49729b8aecb3f8e514ab724fa224ab015a964a5d242202f4629d720f33ea85aff1b78c3dfe
-EBUILD mini-xml-2.6.ebuild 1487 SHA256 538b8f304bf6ac1544e7027166ee7ecac56665438f19cdf8942184511a8b7375 SHA512 7a17ead11fae4f915b32268a1a179747b23c93bb69c295ac9a83a6d092576a6309225557c1eb1d6fb3b0cac1ba43e435cbbb3b4d62a3bee5c0b3e008186fd59f WHIRLPOOL 4960cf5d1708643389b86d4aaad96aaf207932e4714ce45026b10d34aaa0bea0cc6a8f9256213a8bdcf6629625f867c74a0894461a66b4f249cde29a7f0c8b6d
-MISC ChangeLog 2884 SHA256 b3740f292f5d8d7a75d35aa1d0d1de122b7aa908177bb675b67af7353afbb454 SHA512 395430ff76e73c2662009fddca1762f48e5eebcc030fa46338f9bc0558558b86001a52c6568252efd60f32af5e6d878fb510eb1cc0c92db034247f344572eb61 WHIRLPOOL 0f55fe14cb3a561a4550cc7bd513d48f70fb3000e2fd940ce4239e0c0817e96b0b631404b9bc65b016b641ce51fa9d4dcd55c00bfb1b8769c83cbc302fc49c48
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+EBUILD mini-xml-2.2.1.ebuild 969 SHA256 057106671c667365d2d28308afb26bd87f7e0410eb2985a33ff9935076ef04a1 SHA512 29136095c63452d5912dd9db9147177adb4c23957c51f98b0853077a005e99d9e1121362d289d9f041a3447490baa3170eb84ca990ea5d78ae3d3c96790f3af0 WHIRLPOOL ba55a2e0eb5076a53961465c208b68aa4a8908b775366ab0fd8834eeb141c352a627551621495e841e6a403650f59cf9a227acc90157426b63a210e4e24bd378
+EBUILD mini-xml-2.6.ebuild 1483 SHA256 2170bffec8b9af210b23b28893d398e4973257a5e883248e44e755bdf28a93ee SHA512 678ee78842afd68333a3198fc62ab951ec4ca75c7cd2748868b7cd945d9ecd4544b636c8fbcf3bcf389435b18354f18240f10e15a0bcfeaab4180a49794a68c2 WHIRLPOOL 89a9f14cc1fac8cd4b52d1e68a587734877afa231c6457163ff23ee8f1ffd80633475c041e5c36283525b9224cd9cc06de3f1585c761135968276d89d290c7f6
+MISC ChangeLog 3088 SHA256 8b1811898af130ca67991742912c77fe0fff99e4e1921f8c9ce9283da50e7cd0 SHA512 95d46b72a3051a118ecdfa48549c7aec2a771af303de785f260e063a5b947856b061b1a52bdb9b5ab588f4a9d8b85172d4f061c50a8ffd890b383571bd81e3da WHIRLPOOL e10e6348c9c723edce7e84fb07bd0a0ab370b3730484e9d83471736d89ad73ec3e5a8448700ad16154f1a41b18c4c59cf10c481a1fac0a79285c8780cd33301f
+MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlAGmXwACgkQgAnW8HDreRaWHgCfRN1T31YwL4yarMe1F6mNgkt2
+K80AoMnu9l7eLO8gC41i+Q5brzjfisoT
+=hsyI
+-----END PGP SIGNATURE-----
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