Fix quoting in 1.74, remove obsolete 1.73.

(Portage version: 2.1.3.19)

5 files changed, 14 insertions, 106 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 3d278872598d..5c4d31d1c37f 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.67 2007/06/25 21:21:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.68 2007/11/10 10:53:23 nelchael Exp $
+
+  10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/scite-1.73-install.patch, -scite-1.73.ebuild, scite-1.74.ebuild:
+  Fix quoting in 1.74, remove obsolete 1.73.
 
 *scite-1.74 (25 Jun 2007)
 
diff --git a/app-editors/scite/files/digest-scite-1.73 b/app-editors/scite/files/digest-scite-1.73
deleted file mode 100644
index 730be17b1b21..000000000000
--- a/app-editors/scite/files/digest-scite-1.73
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e8e4139b5f5db445b3da9ff070d9d3a scite173.tgz 1343699
-RMD160 443fa627dbe559fa3ec3620bbec759ba0dc93634 scite173.tgz 1343699
-SHA256 1dde09224162f3dadd440ba08beb1f425c997e73559e2107f4fc4bfd52a779c4 scite173.tgz 1343699
diff --git a/app-editors/scite/files/scite-1.73-install.patch b/app-editors/scite/files/scite-1.73-install.patch
deleted file mode 100644
index c1d87501c855..000000000000
--- a/app-editors/scite/files/scite-1.73-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- scite/gtk/makefile.orig	2006-10-09 06:26:55 -0300
-+++ scite/gtk/makefile	2006-10-09 06:36:09 -0300
-@@ -123,11 +123,14 @@
- 
- ifdef gnomeprefix
- ifdef GTK2
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
-+	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
- else
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
-+	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
- endif
--	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(INSTALL) -m 644 -d $(DESTDIR)$(pixmapdir)/
-+	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
- endif
- 
- uninstall:
diff --git a/app-editors/scite/scite-1.73.ebuild b/app-editors/scite/scite-1.73.ebuild
deleted file mode 100644
index 42bace296e08..000000000000
--- a/app-editors/scite/scite-1.73.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.73.ebuild,v 1.3 2007/04/21 12:47:58 nelchael Exp $
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://scintilla.sourceforge.net/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="lua"
-
-RDEPEND=">=x11-libs/gtk+-2
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/${PN}/gtk
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/scintilla/gtk
-	sed -i makefile \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		|| die "error patching makefile"
-
-	cd ${S}
-	sed -i makefile \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		|| die "error patching makefile"
-	epatch ${FILESDIR}/${P}-install.patch
-}
-
-src_compile() {
-	make -C ../../scintilla/gtk || die "prep make failed"
-	if use lua; then
-		emake || die "make failed"
-	else
-		emake NO_LUA=1 || die "make failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	make prefix=${D}/usr install || die
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
-	dosym /usr/bin/scite /usr/bin/SciTE
-
-	# replace .desktop file with our own working version
-	insinto /usr/share/applications
-	rm -f ${D}/usr/share/applications/SciTE.desktop
-	doins ${FILESDIR}/scite.desktop
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
diff --git a/app-editors/scite/scite-1.74.ebuild b/app-editors/scite/scite-1.74.ebuild
index a3b882c86cce..4a52c3569a66 100644
--- a/app-editors/scite/scite-1.74.ebuild
+++ b/app-editors/scite/scite-1.74.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.74.ebuild,v 1.1 2007/06/25 21:21:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.74.ebuild,v 1.2 2007/11/10 10:53:23 nelchael Exp $
 
 inherit toolchain-funcs eutils
 
@@ -20,18 +20,18 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-apps/sed-4"
 
-S=${WORKDIR}/${PN}/gtk
+S="${WORKDIR}/${PN}/gtk"
 
 src_unpack() {
 	unpack ${A}
-	cd ${WORKDIR}/scintilla/gtk
+	cd "${WORKDIR}/scintilla/gtk"
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
-	cd ${S}
+	cd "${S}"
 	sed -i makefile \
 		-e 's#usr/local#usr#g' \
 		-e 's#/gnome/apps/Applications#/applications#' \
@@ -41,7 +41,7 @@ src_unpack() {
 		-e 's#${D}##' \
 		-e 's#-g root#-g 0#' \
 		|| die "error patching makefile"
-	epatch ${FILESDIR}/${P}-install.patch
+	epatch "${FILESDIR}/${P}-install.patch"
 }
 
 src_compile() {
@@ -57,16 +57,16 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/share/{pixmaps,applications}
 
-	make prefix=${D}/usr install || die
+	make prefix="${D}/usr" install || die
 
 	# we have to keep this because otherwise it'll break upgrading
-	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
+	mv "${D}/usr/bin/SciTE" "${D}/usr/bin/scite"
 	dosym /usr/bin/scite /usr/bin/SciTE
 
 	# replace .desktop file with our own working version
 	insinto /usr/share/applications
-	rm -f ${D}/usr/share/applications/SciTE.desktop
-	doins ${FILESDIR}/scite.desktop
+	rm -f "${D}/usr/share/applications/SciTE.desktop"
+	doins "${FILESDIR}/scite.desktop"
 
 	doman ../doc/scite.1
 	dodoc ../README