diff --git a/dev-libs/libstrl/Manifest b/dev-libs/libstrl/Manifest
--- a/dev-libs/libstrl/Manifest
+++ b/dev-libs/libstrl/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA256
 
 DIST libstrl-0.2.tar.bz2 243705 RMD160 9e928ad1ae179a82a2d83c29c409e03c924784e2 SHA1 b7b7222be373a6e43eb8add6143daf5bed4d018b SHA256 210b08753da8146d548c9404a18af2e01f7b9c30cb961e4d3e12671f07ae0587
-EBUILD libstrl-0.2.ebuild 1009 RMD160 9aa68ec9fa28239f860c104470b3f56fe92efe02 SHA1 191c14238f7848e5694d92ed8d3995bccbd272bf SHA256 18b1327ef28abee4472e3c765c9a0fe2a80dbedc1d32523c20c3085f5db57bed
+EBUILD libstrl-0.2-r1.ebuild 638 RMD160 f534f7b0833c8a30ef2c3975ef12192e1297dbcb SHA1 eb8223a128e338df1cbb32423d8a30975823a328 SHA256 71407c76fdfa2d66c8e7594d3b8218648dd126b4402887ba690756496996730a
 MISC metadata.xml 214 RMD160 bb0d8258795c3f73de94e0a8bc00e682d501385e SHA1 3deb0e98b60dbe29b548ad26852379fbdd07bb23 SHA256 2fff4b9c64633c18ee5ee3f2ff48f30d8310d56e414f09c0a1eacf4396dc1535
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNCwqdAAoJEHQ6UuhrqBBQmaYQAKYIHo8JN0wtCsRHKIC7DiMy
-7FzImEvXHWyAV9uJeWuIW4Piko13trqkPjQWeYUbIGbVapRhT899YaZKXiWr5GwU
-l9x3Mb2tO6w1B9mqvNBzMqD+1fuGqPmc1UM6FWPREYWbXe+OcdYkgBpkUeSrXwwg
-xa/wxlj1GpN+3xgzsYeNMXzGwSQM3Ftj0rAwRhdayHM63EZKqUChToHPvUFQPSIE
-tcDsglsZIdZ/8J1177BAYZG6J55P2w9Z+Zfp2hp3pFdA7IcvQi1BTHiGh7I6c55E
-bGPc77N9nz+2bgXKzKwtyKON9efMXxU7UDp+dxXX8Y9s7TwWjPf7cGPhnbcxexPa
-V9uMzc+6O0OqgpZjq+t1NBxzj7mixfcW2257vRVbhrkqAFow8NscRQUR8vaKqRzx
-biMQlTfoXOGUx0aF6c/wRvHxLwh5vd+BcEsedt0pOSADL/l/oAYQfzgBGEm8Onqe
-B6hom2Q0XHe9NY63qg4lB0Yvfn7SfgSCiSHdC37qwy8JEtdO3VKkbwtV7xSQgmxr
-W0PRIKm+lV/YwGFU+HQ3tXnQBWyYOHnd7XdXteCv8RlsdJ/t4OxS/8DZIP1j6fVA
-1LtH+KE5w9BgcAyQvjDYLC92Hi+GHU+PKUXXgUXf+mbFH17ers818l8HTq6xH1LN
-qBGaXetiaZVjmZY8dcxp
-=PYsw
+iQIcBAEBCAAGBQJNISpyAAoJEHQ6UuhrqBBQ6mAP/3FZwVwbeC359CzsnR3KWCeH
+PpFw+KIeE5R/d9dTvJLHoMZiKverixpHRmKijjZjFhGhz1z/MmH9J14QygOKwH16
+NfCfvXw5iJzVVXf11Rw1zLt+FWt1RPbkr5ivenWX90UnnFxIJGs07286AQiecbn+
+4sd6d2KsI1ekvY6f+tKyC/wsfUSJpWMZHkX/kBsEbCzxryWsB796VW0R6Aplk7ns
+6Dg4E/WF33XXuTzBvTfaOnvT178o41upqHvktOTawQll89oLlryu/WtG8U5OuHiZ
+tY6hPQDOnugHQYc+BydhgOC1ouepJwH+Y/Ohxr7Gb1Gr3+yWNsJILna31lG0UpE1
+FUoMYX6n3szPKhQCgzGIk9HAoZIgFVxy6G/u3L/LuCxxJpKB49aqyrZttkoPKpd3
+JyYscEvv1jrIUc2D8/qOBruRuyKcbuUVLidJhZh1+yTThIcgDT3AI9au2UNPHPC2
+267dxb5ZTwwLYU1OkyoAxGFJ7HgFWEQIeio8FVGWk7En7LL7vce/862NdqiF5OCH
+wLuYrR+qnfxJwzolUTt4RFUlVd6IDgcqLUdRnWRxmQK6uusJ1Ng0O1vSELmGn5mJ
+ZJmgEziCXbKDUp4a8odQHb2+ltC0Rn/04bOfC3nkeeQl13cnSyZOE6Ypv607TvdF
+4MryBlRba2RF8+6+7iju
+=jaQg
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libstrl/libstrl-0.2.ebuild b/dev-libs/libstrl/libstrl-0.2-r1.ebuild
rename from dev-libs/libstrl/libstrl-0.2.ebuild
rename to dev-libs/libstrl/libstrl-0.2-r1.ebuild
--- a/dev-libs/libstrl/libstrl-0.2.ebuild
+++ b/dev-libs/libstrl/libstrl-0.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.9.ebuild,v 1.12 2009/11/04 12:12:05 arfrever Exp $
+# $Header: $
 
 EAPI="2"
 
-inherit base multilib
+inherit autotools-utils multilib
 
 DESCRIPTION="Compat library for functions like strlcpy(), strlcat(), and strnlen()"
 HOMEPAGE="http://ohnopub.net/~ohnobinki/libstrl/"
@@ -20,18 +20,10 @@ DEPEND="doc? ( app-doc/doxygen )
 RDEPEND=""
 
 src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static) \
-		$(use_with doc doxygen) \
+	myeconfargs=(
+		$(use_with doc doxygen)
 		$(use_with test check)
-}
+	)
 
-src_install() {
-	base_src_install
-
-	# We remove the .la file unconditionally (even when the static-libs
-	# flags is set) because upstream (myself) only supports linking
-	# through pkg-config.
-	rm -vf "${D}"/usr/$(get_libdir)/libstrl.la || die
+	autotools-utils_src_configure
 }