[patch] spice-3.5.5.ebuild.diff

spice-3.5.5.ebuild.diff (text/plain), 1.98 KB, created by Jakub Moc (RETIRED) on 2007-03-18 11:18:50 UTC

--- /usr/portage/sci-electronics/spice/spice-3.5.5.ebuild	2007-03-12 19:36:08.000000000 +0100
+++ spice-3.5.5.ebuild	2007-03-18 12:15:00.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5.ebuild,v 1.5 2007/03/12 18:21:20 calchan Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
 
 IUSE=""
 
@@ -15,11 +15,11 @@
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 
-DEPEND="sys-libs/ncurses
-	|| ( ( x11-libs/libXaw
-		x11-proto/xproto
-		)
-		virtual/x11 )"
+RDEPEND="sys-libs/ncurses
+	x11-libs/libXaw"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
 
 S=${WORKDIR}/${MY_P}
 
@@ -28,7 +28,7 @@
 	replace-flags -O* -O1
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# Avoid re-creating WORKDIR due to stupid mtime
 	touch ..
 
@@ -36,28 +36,29 @@
 	sed -i -e "s:termcap:ncurses:g" \
 		-e "s:joe:${EDITOR}:g" \
 		-e "s:-O2 -s:${CFLAGS}:g" \
-		-e "s:SPICE_DIR)/lib:SPICE_DIR)/lib/spice:g" \
+		-e "s:SPICE_DIR)/lib:SPICE_DIR)/$(get_libdir)/spice:g" \
 		-e "s:/usr/local/spice:/usr:g" \
+		-e "s:/X11R6::" \
 		conf/linux
 	sed -i -e "s:head -1:head -n 1:" util/build
-	epatch ${FILESDIR}/${P}-gcc-4.1.patch
+	epatch "${FILESDIR}"/${P}-gcc-4.1.patch
 }
 
 src_compile() {
-	./util/build linux || die
-	obj/bin/makeidx lib/helpdir/spice.txt || die
+	./util/build linux || die "build failed"
+	obj/bin/makeidx lib/helpdir/spice.txt || die "makeidx failed"
 }
 
 src_install() {
-	cd ${S}
+	cd "${S}"
 	# install binaries
-	dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} || die
+	dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} || die "failed to copy binaries"
 	newbin obj/bin/help spice.help
 	dosym /usr/bin/spice3 /usr/bin/spice
 	# install runtime stuff
 	rm -f lib/make*
-	dodir /usr/lib/spice
-	cp -R lib/* ${D}/usr/lib/spice/
+	dodir /usr/$(get_libdir)/spice
+	cp -R lib/* "${D}"/usr/$(get_libdir)/spice/
 	# install docs
 	doman man/man1/*.1
 	dodoc readme readme.Linux notes/spice2