removed gtk2 use flag. defaults to gtk2 only. (#106560)

(Portage version: 2.0.53_rc7)

11 files changed, 16 insertions, 324 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index a28dd1f5dd67..812c49f1e92d 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.41 2005/08/29 02:30:49 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.42 2005/11/03 20:58:02 liquidx Exp $
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> -scite-1.61.ebuild,
+  scite-1.62.ebuild, -scite-1.63.ebuild, -scite-1.64.ebuild,
+  -scite-1.65.ebuild, scite-1.66.ebuild:
+  removed gtk2 use flag. defaults to gtk2 only. (#106560)
 
 *scite-1.66 (29 Aug 2005)
 
diff --git a/app-editors/scite/files/digest-scite-1.61 b/app-editors/scite/files/digest-scite-1.61
deleted file mode 100644
index 923f76b0d129..000000000000
--- a/app-editors/scite/files/digest-scite-1.61
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13a08edea3103e4c72d66dee69342120 scite161.tgz 1109244
diff --git a/app-editors/scite/files/digest-scite-1.63 b/app-editors/scite/files/digest-scite-1.63
deleted file mode 100644
index 40e65586e3d5..000000000000
--- a/app-editors/scite/files/digest-scite-1.63
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e92bd082788759f2a3ee629d1688cdb8 scite163.tgz 1180760
diff --git a/app-editors/scite/files/digest-scite-1.64 b/app-editors/scite/files/digest-scite-1.64
deleted file mode 100644
index 8412aa740ca3..000000000000
--- a/app-editors/scite/files/digest-scite-1.64
+++ /dev/null
@@ -1 +0,0 @@
-MD5 745860eb91d3a2d65288856e52ab03a5 scite164.tgz 1227728
diff --git a/app-editors/scite/files/digest-scite-1.65 b/app-editors/scite/files/digest-scite-1.65
deleted file mode 100644
index 6365d1d753a4..000000000000
--- a/app-editors/scite/files/digest-scite-1.65
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb540f32665ca052f3167f2dd933807b scite165.tgz 1230655
diff --git a/app-editors/scite/scite-1.61.ebuild b/app-editors/scite/scite-1.61.ebuild
deleted file mode 100644
index fa34535ad98b..000000000000
--- a/app-editors/scite/scite-1.61.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.61.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
-
-inherit toolchain-funcs
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="ppc sparc x86"
-IUSE="gtk2 lua"
-
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	>=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}##' \
-		|| die "error patching makefile"
-
-}
-
-src_compile() {
-	local makeopts
-	use gtk2 || makeopts="GTK1=1"
-	#use debug && makeopts="${makeopts} DEBUG=1"
-
-	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/pixmaps
-	dodir /usr/share/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.62.ebuild b/app-editors/scite/scite-1.62.ebuild
index 9488e31307f3..42633d8f00f9 100644
--- a/app-editors/scite/scite-1.62.ebuild
+++ b/app-editors/scite/scite-1.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.62.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.62.ebuild,v 1.2 2005/11/03 20:58:02 liquidx Exp $
 
 inherit toolchain-funcs
 
@@ -12,10 +12,9 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 LICENSE="Scintilla"
 SLOT="0"
 KEYWORDS="ppc sparc x86 amd64"
-IUSE="gtk2 lua"
+IUSE="lua"
 
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
+RDEPEND=">=x11-libs/gtk+-2
 	lua? ( >=dev-lang/lua-5 )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
@@ -44,12 +43,8 @@ src_unpack() {
 }
 
 src_compile() {
-	local makeopts
-	use gtk2 || makeopts="GTK1=1"
-	#use debug && makeopts="${makeopts} DEBUG=1"
-
-	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
-	emake ${makeopts} || die "make failed"
+	make -C ../../scintilla/gtk || die "prep make failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/app-editors/scite/scite-1.63.ebuild b/app-editors/scite/scite-1.63.ebuild
deleted file mode 100644
index 0465cf073e5e..000000000000
--- a/app-editors/scite/scite-1.63.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.63.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
-
-inherit toolchain-funcs
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE="gtk2 lua"
-
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	>=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}##' \
-		|| die "error patching makefile"
-
-}
-
-src_compile() {
-	local makeopts
-	use gtk2 || makeopts="GTK1=1"
-	#use debug && makeopts="${makeopts} DEBUG=1"
-
-	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/pixmaps
-	dodir /usr/share/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.64.ebuild b/app-editors/scite/scite-1.64.ebuild
deleted file mode 100644
index b8890492a42b..000000000000
--- a/app-editors/scite/scite-1.64.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.64.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
-
-inherit toolchain-funcs
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE="gtk2 lua"
-
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	>=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}##' \
-		|| die "error patching makefile"
-
-}
-
-src_compile() {
-	local makeopts
-	use gtk2 || makeopts="GTK1=1"
-	#use debug && makeopts="${makeopts} DEBUG=1"
-
-	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/pixmaps
-	dodir /usr/share/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.65.ebuild b/app-editors/scite/scite-1.65.ebuild
deleted file mode 100644
index 2734bb13dd81..000000000000
--- a/app-editors/scite/scite-1.65.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.65.ebuild,v 1.1 2005/08/04 17:15:11 pythonhead Exp $
-
-inherit toolchain-funcs
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE="gtk2 lua"
-
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
-	>=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}##' \
-		|| die "error patching makefile"
-}
-
-src_compile() {
-	local makeopts
-	use gtk2 || makeopts="GTK1=1"
-	#use debug && makeopts="${makeopts} DEBUG=1"
-
-	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
-	emake ${makeopts} || die "make failed"
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/pixmaps
-	dodir /usr/share/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.66.ebuild b/app-editors/scite/scite-1.66.ebuild
index 3734f9317c67..888f6b7b4283 100644
--- a/app-editors/scite/scite-1.66.ebuild
+++ b/app-editors/scite/scite-1.66.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.66.ebuild,v 1.1 2005/08/29 02:30:49 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.66.ebuild,v 1.2 2005/11/03 20:58:02 liquidx Exp $
 
 inherit toolchain-funcs
 
@@ -12,10 +12,9 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 LICENSE="Scintilla"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE="gtk2 lua"
+IUSE="lua"
 
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
+RDEPEND=">=x11-libs/gtk+-2
 	lua? ( >=dev-lang/lua-5 )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
@@ -43,12 +42,8 @@ src_unpack() {
 }
 
 src_compile() {
-	local makeopts
-	use gtk2 || makeopts="GTK1=1"
-	#use debug && makeopts="${makeopts} DEBUG=1"
-
-	make -C ../../scintilla/gtk ${makeopts}  || die "prep make failed"
-	emake ${makeopts} || die "make failed"
+	make -C ../../scintilla/gtk || die "prep make failed"
+	emake || die "make failed"
 }
 
 src_install() {