Fix quoting in 1.74, remove obsolete 1.73.

Package-Manager: portage-2.1.3.19

6 files changed, 26 insertions, 130 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/Manifest b/app-editors/scite/Manifest
index 652812d06aeb..559f5c390d2a 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -5,10 +5,6 @@ AUX scite-1.72-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b
 MD5 95ea30a65640fb6a0149413208179d45 files/scite-1.72-install.patch 796
 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b files/scite-1.72-install.patch 796
 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294 files/scite-1.72-install.patch 796
-AUX scite-1.73-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
-MD5 95ea30a65640fb6a0149413208179d45 files/scite-1.73-install.patch 796
-RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b files/scite-1.73-install.patch 796
-SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294 files/scite-1.73-install.patch 796
 AUX scite-1.74-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
 MD5 95ea30a65640fb6a0149413208179d45 files/scite-1.74-install.patch 796
 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b files/scite-1.74-install.patch 796
@@ -18,24 +14,19 @@ MD5 2561568c62ec3edc2b46be6638c80427 files/scite.desktop 169
 RMD160 760e2de111a56d037265b748ad65c621c1607c3b files/scite.desktop 169
 SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc files/scite.desktop 169
 DIST scite172.tgz 1335014 RMD160 7ffcfa07f43560122692bc4bd00bc910167e9082 SHA1 5cb13215db44a7f37c4625fada8ca7f5e2dfbe96 SHA256 336c9b93f731882c9c5b95eadbe2751097347113e1d729c49b3e5f85ca4ad42e
-DIST scite173.tgz 1343699 RMD160 443fa627dbe559fa3ec3620bbec759ba0dc93634 SHA1 2377e09f9bd208c56eacbd6f6bf4d58bec5efa50 SHA256 1dde09224162f3dadd440ba08beb1f425c997e73559e2107f4fc4bfd52a779c4
 DIST scite174.tgz 1460459 RMD160 a4547865bf2884108fbfbc8eaae1c7d1200ddd47 SHA1 64066ed557c15821a50955b86acdda0d32e0a472 SHA256 10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01
 EBUILD scite-1.72.ebuild 1862 RMD160 ec5457be0aded4d43982f6d1bcc8cff8d66add13 SHA1 b2b1ca18797195cf6ad0e4216238ada64c0a6005 SHA256 4fecc63808b6ba8255de1a7e8ac356bf2bcdf0aabf31f2c8b5fbb1f95f5fd47c
 MD5 06bc55f30eb992afaa14122707bc9da6 scite-1.72.ebuild 1862
 RMD160 ec5457be0aded4d43982f6d1bcc8cff8d66add13 scite-1.72.ebuild 1862
 SHA256 4fecc63808b6ba8255de1a7e8ac356bf2bcdf0aabf31f2c8b5fbb1f95f5fd47c scite-1.72.ebuild 1862
-EBUILD scite-1.73.ebuild 1868 RMD160 57c180de671cf0238e5061507c672482cea1aba6 SHA1 a0ba3d086505e77aa6d19383eb52fdd0f4457255 SHA256 b5e04b100ac77fdfe9d699abca9f1fda922dae7c7acedecc6574528a85a9ed3a
-MD5 f7f2074a04814836fa25c6057292a8b5 scite-1.73.ebuild 1868
-RMD160 57c180de671cf0238e5061507c672482cea1aba6 scite-1.73.ebuild 1868
-SHA256 b5e04b100ac77fdfe9d699abca9f1fda922dae7c7acedecc6574528a85a9ed3a scite-1.73.ebuild 1868
-EBUILD scite-1.74.ebuild 1868 RMD160 5fa5c296cc748ca8cb846b0d521f8773b20906c1 SHA1 4eb51e50832182048ad76edd698ee6b99492210e SHA256 61ca4b7ece130899589c90e1ccb4e1737e7e0b1d7bc277b4b2f8f7fd5c0e5566
-MD5 ff3306d83739caa71d6f66dc2b550651 scite-1.74.ebuild 1868
-RMD160 5fa5c296cc748ca8cb846b0d521f8773b20906c1 scite-1.74.ebuild 1868
-SHA256 61ca4b7ece130899589c90e1ccb4e1737e7e0b1d7bc277b4b2f8f7fd5c0e5566 scite-1.74.ebuild 1868
-MISC ChangeLog 10501 RMD160 41db229da7c10cf228a7a50956539026177dd697 SHA1 8ef1a584fd3435ba27997bbd81bca8079040cc20 SHA256 b19eb8b904d8c60003523e13e91b13583b226e03d2a1e822ee0011740e3671a5
-MD5 00ba7b85dc19de5a349c9ede33e28844 ChangeLog 10501
-RMD160 41db229da7c10cf228a7a50956539026177dd697 ChangeLog 10501
-SHA256 b19eb8b904d8c60003523e13e91b13583b226e03d2a1e822ee0011740e3671a5 ChangeLog 10501
+EBUILD scite-1.74.ebuild 1886 RMD160 19b24324e50c72c84a51452106a6193fb3ed16e6 SHA1 3522bd31bd789ad5f1cc33aff00082314801b29e SHA256 6f4c505888bcd337cf0b99d22893f4ac17b44514bec21e396f8528e8b8bf1dc0
+MD5 236194d47695e23ec6c13cfdbf3561f8 scite-1.74.ebuild 1886
+RMD160 19b24324e50c72c84a51452106a6193fb3ed16e6 scite-1.74.ebuild 1886
+SHA256 6f4c505888bcd337cf0b99d22893f4ac17b44514bec21e396f8528e8b8bf1dc0 scite-1.74.ebuild 1886
+MISC ChangeLog 10674 RMD160 3b1312c97eae499193306c381e1c239da8d629cf SHA1 f8933aa20467e7af00220041fb6c4b8bb3211132 SHA256 50303721292a9dd7129be57d164aeb1e89a9c61f42ead0614ba47d067f01cac2
+MD5 7deca24220c459b2a2e0b18d9ee24e12 ChangeLog 10674
+RMD160 3b1312c97eae499193306c381e1c239da8d629cf ChangeLog 10674
+SHA256 50303721292a9dd7129be57d164aeb1e89a9c61f42ead0614ba47d067f01cac2 ChangeLog 10674
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 MD5 013655633e03ee4396e6da8e45481935 metadata.xml 304
 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 metadata.xml 304
@@ -43,16 +34,13 @@ SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655 metadata
 MD5 795ad57c1d661adc1bcf15e33f29643d files/digest-scite-1.72 220
 RMD160 f98515139e17062db6e63c4178f69fa2899ca0dd files/digest-scite-1.72 220
 SHA256 127493ead23d654728f2fd27b0466207a259be42d2e9cef0610d464c28b31498 files/digest-scite-1.72 220
-MD5 fec3dffa23603b86bc571b7a6bfc27d2 files/digest-scite-1.73 220
-RMD160 49a2434f90d3270bea04aa500b1b07ee8a5d5f9d files/digest-scite-1.73 220
-SHA256 acce6a6481c0193caad48a16d0851a6a18179479b78acafbcdd6e64bfa89743a files/digest-scite-1.73 220
 MD5 7e774fbe84405fa76d31351488544594 files/digest-scite-1.74 220
 RMD160 2681ee36c881b092155884a5b7bacf692eb78e02 files/digest-scite-1.74 220
 SHA256 19eba9f828a3d69162e0ce62963a87fabccb78e0efa50b9b78c318213309ea1f files/digest-scite-1.74 220
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGgDH7go/w9rxVVVERAsTMAJ4/dNnodqm+xEtWJnPx9cKW0sD1hgCdH4R0
-a7ralhK8DKb+uCJrQXMGkBM=
-=xkv+
+iD8DBQFHNY2qgo/w9rxVVVERAnHxAJ0ajodDQdMIFTCWl10EWUDTlwRloQCgnAzq
+fIRyGre+cSKpAMvMiV3L7FI=
+=cBsD
 -----END PGP SIGNATURE-----
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