Change ebuild to just build gtk2 package, and get rid of gtk2 use flag

Package-Manager: portage-2.1.2_pre1

4 files changed, 21 insertions, 37 deletions

diff --git a/net-misc/ghamachi/ChangeLog b/net-misc/ghamachi/ChangeLog
index d5e62af021fb..2d519d20936c 100644
--- a/net-misc/ghamachi/ChangeLog
+++ b/net-misc/ghamachi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/ghamachi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ghamachi/ChangeLog,v 1.1 2006/09/21 14:35:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ghamachi/ChangeLog,v 1.2 2006/09/22 12:19:51 caleb Exp $
+
+  22 Sep 2006; Caleb Tennis <caleb@gentoo.org> ghamachi-0.7.3.ebuild:
+  Change ebuild to just build gtk2 package, and get rid of gtk2 use flag
 
 *ghamachi-0.7.3 (20 Sep 2006)
 
diff --git a/net-misc/ghamachi/Manifest b/net-misc/ghamachi/Manifest
index 5ddad375ba79..c9401130cd19 100644
--- a/net-misc/ghamachi/Manifest
+++ b/net-misc/ghamachi/Manifest
@@ -1,17 +1,16 @@
-DIST gHamachi_gtk1.2.tar.gz 59578 RMD160 a0155ff237b98ae922e2ccd317c33fce7fd848e4 SHA1 dece9094e71e10541f0d7317cf262362936e47cf SHA256 b7a1724ee36e554b3a4406f246d8c3767721d6c6ea0b39b27bca387e8515a7cf
 DIST gHamachi_gtk2.tar.gz 54812 RMD160 caf5f3912fe0904aff48707a67177fcaa2f9c523 SHA1 6f213cd8a894a1b5d909231f95da48659c020953 SHA256 c1833cbec1cbcf0ab34f0acaee80f9144f482b3bab99ffe72062018951de97d3
-EBUILD ghamachi-0.7.3.ebuild 1215 RMD160 d841527c0f9af31fb86be5cc1f176cb6e0105bd5 SHA1 b9bfcbbb602d8ff41dbf36260e1f8b536a51ff2f SHA256 57765585ac994ec8ca9638736f7c64df1bdd7e0bfb6cd2ac9f76f3d7e59db5d5
-MD5 2ae304eadca5cc45e076f8220fc44ed4 ghamachi-0.7.3.ebuild 1215
-RMD160 d841527c0f9af31fb86be5cc1f176cb6e0105bd5 ghamachi-0.7.3.ebuild 1215
-SHA256 57765585ac994ec8ca9638736f7c64df1bdd7e0bfb6cd2ac9f76f3d7e59db5d5 ghamachi-0.7.3.ebuild 1215
-MISC ChangeLog 361 RMD160 f9a25b16c7a5d2f33e6ba3b2e7ca84daac81d1da SHA1 99d44ecfa14d7fca5ad394dea4e1211f0f15db2d SHA256 6107b65054def22032da535929be2547bd17a5c3fa409e2e02feb2fd01ee08b3
-MD5 297a6125a651a9f208553a69d6d838e9 ChangeLog 361
-RMD160 f9a25b16c7a5d2f33e6ba3b2e7ca84daac81d1da ChangeLog 361
-SHA256 6107b65054def22032da535929be2547bd17a5c3fa409e2e02feb2fd01ee08b3 ChangeLog 361
+EBUILD ghamachi-0.7.3.ebuild 847 RMD160 cb165b8eaee400ea225182a617ca38ce4501f2d0 SHA1 5bd97474772fe0e890d0eaddf1332669b3eff9a4 SHA256 87dd23f0bf9cba509ac5820ed64692d5bf18429328c2a9426bd7dc01ef9280d9
+MD5 9317af1423f909c741631a3a0ea08619 ghamachi-0.7.3.ebuild 847
+RMD160 cb165b8eaee400ea225182a617ca38ce4501f2d0 ghamachi-0.7.3.ebuild 847
+SHA256 87dd23f0bf9cba509ac5820ed64692d5bf18429328c2a9426bd7dc01ef9280d9 ghamachi-0.7.3.ebuild 847
+MISC ChangeLog 505 RMD160 600972e480f6adb0bb67f0c5cd64794467aa87d9 SHA1 3c2b2acf47dea2cbc29cedb759d5efa84b6a03c8 SHA256 c2cb5455c984943e56616711b9e91e0ed925ce19a3bd21f2ae0b88e956803c7e
+MD5 57761033e95fd141044f800c23e67c0b ChangeLog 505
+RMD160 600972e480f6adb0bb67f0c5cd64794467aa87d9 ChangeLog 505
+SHA256 c2cb5455c984943e56616711b9e91e0ed925ce19a3bd21f2ae0b88e956803c7e ChangeLog 505
 MISC metadata.xml 378 RMD160 074677c9faaebc32c16629b35d8c9fb4385e08d9 SHA1 72e4f95c5b9b58ec040c797374230bbea17c4179 SHA256 e5cc5e0608658e707c7d2ebb563906bb85329d718c1adef534ea8c94d33b25fa
 MD5 e9a6003a212cac5087b317a1c259a022 metadata.xml 378
 RMD160 074677c9faaebc32c16629b35d8c9fb4385e08d9 metadata.xml 378
 SHA256 e5cc5e0608658e707c7d2ebb563906bb85329d718c1adef534ea8c94d33b25fa metadata.xml 378
-MD5 681fd78b81dfb2d0f651cd2d786e5084 files/digest-ghamachi-0.7.3 482
-RMD160 9b099b4a27211ee56f212bbb6c0f25241ec51f4b files/digest-ghamachi-0.7.3 482
-SHA256 7821935586a95d8bef290a172d99fea0c726f2a757bae3831bd069f681ada21a files/digest-ghamachi-0.7.3 482
+MD5 bc9b17646498ed32806881db47783cf6 files/digest-ghamachi-0.7.3 238
+RMD160 029422f402db61629632d5048c4412d912063cce files/digest-ghamachi-0.7.3 238
+SHA256 c710c0cc310c78c36af5cb94038a3e2ea950e61c7b9bc189de9b0f06f95ed9a6 files/digest-ghamachi-0.7.3 238
diff --git a/net-misc/ghamachi/files/digest-ghamachi-0.7.3 b/net-misc/ghamachi/files/digest-ghamachi-0.7.3
index 27e2cc3c6e9e..8e7effa5f52f 100644
--- a/net-misc/ghamachi/files/digest-ghamachi-0.7.3
+++ b/net-misc/ghamachi/files/digest-ghamachi-0.7.3
@@ -1,6 +1,3 @@
-MD5 38f0d1b30e235f0d1a4b25b9bc69565e gHamachi_gtk1.2.tar.gz 59578
-RMD160 a0155ff237b98ae922e2ccd317c33fce7fd848e4 gHamachi_gtk1.2.tar.gz 59578
-SHA256 b7a1724ee36e554b3a4406f246d8c3767721d6c6ea0b39b27bca387e8515a7cf gHamachi_gtk1.2.tar.gz 59578
 MD5 0e121b23ec30f41321525089a32d5537 gHamachi_gtk2.tar.gz 54812
 RMD160 caf5f3912fe0904aff48707a67177fcaa2f9c523 gHamachi_gtk2.tar.gz 54812
 SHA256 c1833cbec1cbcf0ab34f0acaee80f9144f482b3bab99ffe72062018951de97d3 gHamachi_gtk2.tar.gz 54812
diff --git a/net-misc/ghamachi/ghamachi-0.7.3.ebuild b/net-misc/ghamachi/ghamachi-0.7.3.ebuild
index b0a97c3cc02c..b677a388eafb 100644
--- a/net-misc/ghamachi/ghamachi-0.7.3.ebuild
+++ b/net-misc/ghamachi/ghamachi-0.7.3.ebuild
@@ -1,43 +1,28 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ghamachi/ghamachi-0.7.3.ebuild,v 1.1 2006/09/21 14:35:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ghamachi/ghamachi-0.7.3.ebuild,v 1.2 2006/09/22 12:19:51 caleb Exp $
 
 inherit eutils
 
 # gHamachi GUI
-GTK_VER="0.7.3"
 GTK2_VER="0.7.3"
 
 DESCRIPTION="gHamachi is a GUI for the Hamachi tunneling software package."
 HOMEPAGE="http://www.penguinbyte.com/software/ghamachi/"
 LICENSE="as-is"
-SRC_URI="gtk2? ( http://purebasic.myftp.org/files/3/projects/${PN}/v.${GTK_VER}/gHamachi_gtk2.tar.gz )
-	!gtk2? ( http://purebasic.myftp.org/files/3/projects/${PN}/v.${GTK2_VER}/gHamachi_gtk1.2.tar.gz )"
+SRC_URI="http://purebasic.myftp.org/files/3/projects/${PN}/v.${GTK_VER}/gHamachi_gtk2.tar.gz"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="gtk2"
+
 RESTRICT="nostrip nomirror"
 DEPEND="net-misc/hamachi
-	gtk2? ( >=x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1.2* ) "
+	=x11-libs/gtk+-2*"
 
 src_unpack() {
-
-	# Installing gHamachi readme
-	if use gtk2; then
-		unpack gHamachi_gtk2.tar.gz
-		mv ${WORKDIR}/README ${WORKDIR}/README.gHamachi
-	else
-		unpack gHamachi_gtk1.2.tar.gz
-		mv ${WORKDIR}/README ${WORKDIR}/README.gHamachi
-	fi
+	unpack gHamachi_gtk2.tar.gz
+	mv ${WORKDIR}/README ${WORKDIR}/README.gHamachi
 }
 
-#src_compile() { 
-#	
-#	# No compilation
-#}
-
 src_install() {
 	einfo "Installing GUI"
 	insinto /usr/bin