From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 5 Oct 2005 01:39:49 +0000 (+0000)
Subject: touchup syntax
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1595f8bb4fd8d8d9d85af5bc1514d334acc1caec;p=gentoo.git

touchup syntax
Package-Manager: portage-2.0.51.22-r2
---

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 00394de0b7ee..f34eea8c77b7 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -5,7 +5,7 @@ MD5 b9df0b3dd75c05b7440daac11468ab83 xvid-1.1.0_beta2.ebuild 1203
 MD5 d332fc92996c01572c8f514106f41c6d xvid-1.0.0_rc4.ebuild 1074
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 228242414e0235d94a7845883b4cb38e xvid-1.0.3.ebuild 1158
-MD5 2b55e892423eb793e8a8e4d0a52c83fb xvid-1.1.0_beta2-r1.ebuild 1701
+MD5 5d9c598618499db22470d0c822047969 xvid-1.1.0_beta2-r1.ebuild 1624
 MD5 684af8a8c5e487d5e197b2b0f7793cec xvid-1.0.2.ebuild 1212
 MD5 12796f897e8656ae363eee47d96a4e59 xvid-1.0.1.ebuild 1291
 MD5 c951ce0d729ba204c7657bd7008d1ee6 xvid-0.9.2-r1.ebuild 1146
@@ -30,7 +30,7 @@ MD5 0d3933d54c7cd6f3b8a0ff039c73d2de files/digest-xvid-1.1.0_beta2-r1 73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQyqUgIKl8Uu19MoRAqsrAJsF44/HZRjDA2SxpqWqGMkIhIn3iACfcAuQ
-PVG3uZ/+Ulpg7pHQuuZNE9w=
-=iBZk
+iD8DBQFDQy8+gIKl8Uu19MoRAiawAJ9Qq/3l43mvwn03Y8qYTuRlQtGQsACeLnQE
+U4G+JPEyczrXz9nB+9xLJv0=
+=VkKI
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
index ffaf38a6f9af..5f1b57c6f503 100644
--- a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
+++ b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild,v 1.5 2005/08/07 01:54:05 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild,v 1.6 2005/10/05 01:39:49 vapier Exp $
 
-inherit eutils
+inherit eutils fixheadtails
 
 MY_P=${PN}core-${PV/_beta/-beta}
 DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
@@ -18,49 +18,45 @@ DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )
 	amd64? ( dev-lang/yasm )
 	=sys-devel/autoconf-2.5*
 	sys-devel/automake"
+RDEPEND=""
 
-# This is used to avoid having build deps in DEPEND with an empty RDEPEND
-RDEPEND="virtual/libc"
-
-S="${WORKDIR}/${MY_P}/build/generic"
+S=${WORKDIR}/${MY_P}/build/generic
 
 src_unpack() {
 	unpack ${A}
 
-	cd "${WORKDIR}/${MY_P}"
-	epatch "${FILESDIR}/${P}-altivec.patch"
-	epatch "${FILESDIR}/${P}-amd64-gcc4.patch"
+	cd "${WORKDIR}"/${MY_P}
+	epatch "${FILESDIR}"/${P}-altivec.patch
+	epatch "${FILESDIR}"/${P}-amd64-gcc4.patch
 
-	cd ${S}
-	WANT_AUTOCONF="2.5"
-	./bootstrap.sh || die "Bootstrap failed"
+	cd "${S}"
+	ht_fix_file bootstrap.sh
+	WANT_AUTOCONF="2.5" ./bootstrap.sh || die "Bootstrap failed"
 }
 
 src_compile() {
-	econf \
-		$(use_enable altivec) \
-		|| die "econf failed"
+	econf $(use_enable altivec) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	make install DESTDIR="${D}" || die
 
-	cd ${S}/../../
+	cd "${S}"/../../
 	dodoc AUTHORS ChangeLog README TODO doc/*
 
 	if use userland_Darwin; then
-		local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.*.dylib))"
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.*.dylib))
 		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.dylib
 	else
-		local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
 		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
 		dosym ${mylib} /usr/$(get_libdir)/${mylib/.1}
 	fi
 
 	if use doc ; then
 		dodoc CodingStyle doc/README
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
+		docinto examples
+		dodoc examples/*
 	fi
 }