--- orig/libnatpmp-20110808-r1.ebuild	2011-12-17 13:58:05.000000000 +0000
+++ orig/libnatpmp-20110808-r1.ebuild	2011-12-17 19:56:46.500510616 +0000
@@ -19,18 +19,22 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS.patch
-	epatch "${FILESDIR}"/respect-libdir.patch
-	use !static-libs && epatch "${FILESDIR}"/remove-static-lib.patch
+	epatch "${FILESDIR}/${PN}-20110808-flags.patch"
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_test() {
+	default
+	./testgetgateway || die
 }
 
 src_install() {
-	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+	emake PREFIX="${ED}" LIBDIR="$(get_libdir)" install
 
 	dodoc Changelog.txt README
 	doman natpmpc.1
+	use static-libs || find "${ED}" -type f -name '*.a' -delete
 }