--- libupnp-1.6.6-r1.ebuild	2010-10-11 10:53:24.000000000 +0000
+++ libupnp-1.6.14.ebuild	2011-12-03 09:31:25.378298053 +0000
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.6-r1.ebuild,v 1.3 2010/10/11 10:53:24 hwoarang Exp $
 
+EAPI="4"
 WANT_AUTOMAKE=1.9
 
 inherit eutils flag-o-matic autotools
@@ -13,33 +14,37 @@ SRC_URI="mirror://sourceforge/pupnp/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug doc ipv6 static-libs"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND=""
+DEPEND="${RDEPEND}"
 
-	epatch "${FILESDIR}/${P}-patch-statevar-query.patch"
+DOCS="NEWS README ChangeLog"
 
-	AT_M4DIR="m4" eautoreconf
+src_prepare() {
+	sed -e '/AX_CFLAGS_GCC_OPTION/s:-Os::g' \
+		-i "${S}/configure.ac" || die
 
 	# fix tests
-	chmod +x ixml/test/test_document.sh
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	use x86-fbsd &&	append-flags -O1
 	# w/o docdir to avoid sandbox violations
 	econf \
 		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable ipv6) \
+		$(use_enable static-libs static) \
+		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin upnp/sample/upnp_tv_{ctrlpt,device,combo}
-	dodoc NEWS README ChangeLog
+	default
+	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+	use static-libs || find "${ED}" -type f -name '*.la' -delete
 }
 
 pkg_postinst() {
@@ -49,5 +54,4 @@ pkg_postinst() {
 	ewarn ""
 	ewarn "The revdep-rebuild script is part of the"
 	ewarn "app-portage/gentoolkit package."
-	ebeep
 }