Rename pentium useflag to sse. Get rid of old ebuild. Thx to sedzimir on sunrise for patch.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 27 insertions, 205 deletions

diff --git a/net-misc/hamachi/ChangeLog b/net-misc/hamachi/ChangeLog
index 6ed27fb53975..fb53da5efe69 100644
--- a/net-misc/hamachi/ChangeLog
+++ b/net-misc/hamachi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/hamachi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/ChangeLog,v 1.11 2009/07/31 09:26:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/ChangeLog,v 1.12 2009/07/31 11:03:01 scarabeus Exp $
+
+  31 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -hamachi-0.9.9.9_p20-r2.ebuild, hamachi-0.9.9.9_p20-r4.ebuild,
+  -files/hamachi.initd, metadata.xml:
+  Rename pentium useflag to sse. Get rid of old ebuild. Thx to sedzimir on
+  sunrise for patch.
 
 *hamachi-0.9.9.9_p20-r4 (31 Jul 2009)
 
diff --git a/net-misc/hamachi/Manifest b/net-misc/hamachi/Manifest
index 36bca50d8715..4594f7343eef 100644
--- a/net-misc/hamachi/Manifest
+++ b/net-misc/hamachi/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hamachi.confd 485 RMD160 23abf2e0a1c11a88acdf99e179379fc499c48bf2 SHA1 cc3d3c4ec0e84622eb1cefeb6c40c2e4c9de224f SHA256 f2ef14119acc285f7c945b316890cc5a3219b7e71232bb8aa6ad508407839b22
-AUX hamachi.initd 1430 RMD160 8b2241ed245fbb1b3559eb2cd61b665d43157b2f SHA1 d0cb22b2953df3d942bd66e43c17376e27aca57d SHA256 5f1193b63508c3cdfa6a978a9492499f3e3da0eb8ebc34ec02abb22d9eaaea26
 AUX hamachi.initd.2 1331 RMD160 2b219fea4682d5b95d4f910c6865a4eda47b36b2 SHA1 b47f0cb2a7ecd044e63a1c9e520b0bc3a9d647a5 SHA256 6b864ffe8acb60490df28d1cb7df2b59f1aae7400a99cd0f90bec73753d01d60
 AUX tuncfg.confd 288 RMD160 1311a87b30e2fb185505c2945912d6916df75519 SHA1 dcd0829a70c2a3b127d45d2f71ace0f00e1b862d SHA256 d2fdf055d728beb7a570517844883ea1c9ded9fdc8cbd5ded8fc7b5b92ee5c1e
 AUX tuncfg.initd 370 RMD160 5d5c884a8a8745af4db7c1f1f0ee6230e7c42d1c SHA1 fd023110044bdf568de05749a9de85947566114a SHA256 b885dbf0af46284764644ede1fefe08817e8e15b0cc49eb5ec5965822f4139b2
 DIST hamachi-0.9.9.9-20-lnx-pentium.tar.gz 111300 RMD160 7aac53fa9bf678cc1dac6a4b0f33a9b1d93159c1 SHA1 898fe754e5a95eeeaf26996b9e773d4ee1c7f76d SHA256 9377947eed6b8518911a7ee1a0047630ba4ed123e41bff79998e813875cc63dd
 DIST hamachi-0.9.9.9-20-lnx.tar.gz 344866 RMD160 b3af2549fe19aca352200c5fb101e8cd1822fc5d SHA1 c3dfb636ec6abbd8438dc8737fea957e3a854d14 SHA256 9e4b733558377d0c971ee2a19e04c0f5956e069033e8d13865f7c4dcb6d7f31b
-EBUILD hamachi-0.9.9.9_p20-r2.ebuild 2695 RMD160 5cdb0f34e52cb026caa9f5419e64318a3651bf4f SHA1 f52f64ae746835d8846e5b293ed5202c38793b77 SHA256 b7a1d6f094512135b1336086983e76ff918bacb390f09672ef8ef959d2eefd63
-EBUILD hamachi-0.9.9.9_p20-r4.ebuild 2698 RMD160 848750ded21ac62a29d87bb26292391172507ce8 SHA1 d1295f5876fc0afe1d129eda4e09a40aaa8772e8 SHA256 5846b12837cc1b7bca006a43f96530b319d0ab8755b00de58db2ac4095db0c0d
-MISC ChangeLog 1819 RMD160 490a1665d0feb269c42d1393f4789ac86e0f8a12 SHA1 6d32a838787cfd94553b27c48efc62f0fac89d38 SHA256 2939cd31ee0418a2257338d2e7ccea96fd99bd5aaa7a2692f3938b081af79bf0
-MISC metadata.xml 465 RMD160 0002b109e8754d930c6c883886c6caaa94109727 SHA1 e7b6396c08acdf87563cf4a926a4b2f564c54325 SHA256 786b0696eaf4cc91b7b0de7ed53e6dce9832f9b2f4d4615f4e987be82fbb80d0
+EBUILD hamachi-0.9.9.9_p20-r4.ebuild 1973 RMD160 335b71a986e017a522a0331be4f18860f1748940 SHA1 b7950af5321e1d3a98374bda342b810bcaffc422 SHA256 314c32745b56baafa816aa162dbb064d13af1f0e9714ae666c351d3a80c3b889
+MISC ChangeLog 2074 RMD160 b66cd1dec550bee559aede2f56dd2cc084974736 SHA1 2fc4a8d0af65a43a1054c899bf77f877832bfa3c SHA256 6899322299b7b8734fdda82c47ab5b36bd9d958e61902224718296a8b920db56
+MISC metadata.xml 372 RMD160 0a8482bdc91be5999645844bc1e92be291573a2d SHA1 3da77a94e0fceb13f38cd3458833a93a588dbef5 SHA256 d000074801ecda0f31e2ca8dbe60562a3c4e7b66fae7b3ab05ac3c3b2a34a397
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpyz2sACgkQHB6c3gNBRYcgIACgx8FpYBOfyH36m5vz3Xv4aU40
+oQoAnijnRnV8iXn98+GTRve4bttXIuHB
+=xbHH
+-----END PGP SIGNATURE-----
diff --git a/net-misc/hamachi/files/hamachi.initd b/net-misc/hamachi/files/hamachi.initd
deleted file mode 100644
index dd544f00a752..000000000000
--- a/net-misc/hamachi/files/hamachi.initd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="start stop status init"
-
-depend() {
-        need net tuncfg
-}
-
-start() {
-	check_config
-	ebegin "Starting hamachi"
-	start-stop-daemon --quiet --start -c ${USER} \
-                --exec /usr/bin/hamachi -- \
-                -c $CONFDIR start &>${LOG} &
-                result=$?
-
-	if [ $result == 0 ]; then
-                sleep 1
-                chown -R $USER:$GROUP $CONFDIR/ipc_sock
-                chmod g+rwx $CONFDIR/ipc_sock
-                /usr/bin/hamachi -c $CONFDIR login 
-                if [ -z "$(/usr/bin/hamachi -c $CONFDIR | grep 'logged in')" ]; then
-                        result=1
-                        /usr/bin/hamachi -c $CONFDIR stop &>${LOG}
-                fi
-	fi;
-	eend $result
-}
-
-stop() {
-	ebegin "Stopping hamachi"
-	/usr/bin/hamachi -c $CONFDIR logout &>${LOG}
-	/usr/bin/hamachi -c $CONFDIR stop &>${LOG}
-	eend $?
-}
-
-init() {
-	ebegin "Making initial configuration"
-	/usr/bin/hamachi-init -c $CONFDIR 2>&1 >/dev/null
-        chown -R $USER:$GROUP $CONFDIR
-        chmod g+rx $CONFDIR
-	eend $?
-}
-
-check_config() { 
-	if [ ! -d $CONFDIR ] ; then
-		einfo "It seems you don't have configured hamachi yet. Running init now"
-		init
-	fi
-}
-
-status() {
-	service_started "${myservice}" || return 0
-        /usr/bin/hamachi -c $CONFDIR
-        /usr/bin/hamachi -c $CONFDIR list
-}
diff --git a/net-misc/hamachi/hamachi-0.9.9.9_p20-r2.ebuild b/net-misc/hamachi/hamachi-0.9.9.9_p20-r2.ebuild
deleted file mode 100644
index 07e360052cfd..000000000000
--- a/net-misc/hamachi/hamachi-0.9.9.9_p20-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r2.ebuild,v 1.8 2008/09/10 15:58:53 darkside Exp $
-
-inherit eutils linux-info
-
-# gHamachi GUI
-
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}-lnx
-
-DESCRIPTION="Hamachi is a secure mediated peer to peer."
-HOMEPAGE="http://hamachi.cc"
-LICENSE="as-is"
-SRC_URI=" !pentium? ( http://files.hamachi.cc/linux/${MY_P}.tar.gz )
-	  pentium? ( http://files.hamachi.cc/linux/${MY_P}-pentium.tar.gz )"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="pentium"
-RESTRICT="strip mirror"
-
-# Set workdir for both hamachi versions
-if use pentium; then
-	S=${WORKDIR}/${MY_P}-pentium
-else
-	S=${WORKDIR}/${MY_P}
-fi
-
-pkg_preinst() {
-	# Add group "hamachi" & user "hamachi"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-pkg_setup() {
-	einfo "Checking your kernel configuration for TUN/TAP support."
-	CONFIG_CHECK="TUN"
-	check_extra_config
-}
-
-src_unpack() {
-	# Unpack the correct Hamachi version
-	if use !pentium; then
-		unpack ${MY_P}.tar.gz
-	else
-		unpack ${MY_P}-pentium.tar.gz
-	fi
-}
-
-src_compile() {
-	# Compile Tuncfg
-	make -sC "${S}"/tuncfg || die "Compiling of tunecfg failed"
-}
-
-src_install() {
-	# Hamachi
-	einfo "Installing Hamachi"
-	insinto /usr/bin
-	insopts -m0755
-	doins hamachi
-	dosym /usr/bin/hamachi /usr/bin/hamachi-init
-
-	# Tuncfg
-	einfo "Installing Tuncfg"
-	insinto /usr/sbin
-	insopts -m0700
-	doins tuncfg/tuncfg
-
-	# Create log directory
-	dodir /var/log/${PN}
-
-	# Config files
-	einfo "Installing config files"
-	newinitd "${FILESDIR}"/tuncfg.initd tuncfg
-	newconfd "${FILESDIR}"/hamachi.confd hamachi
-	newinitd "${FILESDIR}"/hamachi.initd hamachi
-
-	# Docs
-	dodoc CHANGES README LICENSE LICENSE.openssh LICENSE.openssl LICENSE.tuncfg
-
-}
-
-pkg_postinst() {
-	if use pentium; then
-	einfo "Remember, you set the pentium USE flag!"
-	einfo So, you installed the version for older x86 systems!
-	einfo If your CPU is greater than Intel Pentium / AMD K6,
-	einfo remove the pentium USE flag and try this version!
-	fi
-
-	if use !pentium; then
-	ewarn "If you are seeing 'illegal instruction' error when trying"
-	ewarn "to run Hamachi client, set the pentium USE flag!"
-	ewarn "It enables binaries built specifically for older"
-	ewarn "x86 platforms, like Intel Pentium or AMD K6,"
-	ewarn "with all optimizations turned off."
-	fi
-
-	einfo "To start Hamachi just type:"
-	einfo "/etc/init.d/hamachi start"
-
-	# added for bug #218481
-	einfo "If the 'hamachi' command shows no output, use the following command"
-	einfo "to extract the hamachi executable either with app-arch/upx or"
-	einfo "app-arch/upx-ucl:"
-	einfo "/opt/bin/upx -d /usr/bin/hamachi"
-}
diff --git a/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild b/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild
index 1e9efc14e5b7..31b47c88cb25 100644
--- a/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild
+++ b/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild,v 1.1 2009/07/31 09:26:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild,v 1.2 2009/07/31 11:03:01 scarabeus Exp $
 
 inherit eutils linux-info
 
@@ -12,18 +12,18 @@ MY_P=${PN}-${MY_PV}-lnx
 DESCRIPTION="Hamachi is a secure mediated peer to peer."
 HOMEPAGE="http://hamachi.cc"
 LICENSE="as-is"
-SRC_URI=" !pentium? ( http://files.hamachi.cc/linux/${MY_P}.tar.gz )
-	  pentium? ( http://files.hamachi.cc/linux/${MY_P}-pentium.tar.gz )"
+SRC_URI="sse? ( http://files.hamachi.cc/linux/${MY_P}.tar.gz )
+	!sse? ( http://files.hamachi.cc/linux/${MY_P}-pentium.tar.gz )"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="pentium"
+IUSE="sse"
 RESTRICT="strip mirror"
 
 # Set workdir for both hamachi versions
-if use pentium; then
-	S=${WORKDIR}/${MY_P}-pentium
-else
+if use sse; then
 	S=${WORKDIR}/${MY_P}
+else
+	S=${WORKDIR}/${MY_P}-pentium
 fi
 
 pkg_preinst() {
@@ -38,15 +38,6 @@ pkg_setup() {
 	check_extra_config
 }
 
-src_unpack() {
-	# Unpack the correct Hamachi version
-	if use !pentium; then
-		unpack ${MY_P}.tar.gz
-	else
-		unpack ${MY_P}-pentium.tar.gz
-	fi
-}
-
 src_compile() {
 	# Compile Tuncfg
 	make -sC "${S}"/tuncfg || die "Compiling of tunecfg failed"
@@ -81,21 +72,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use pentium; then
-	einfo "Remember, you set the pentium USE flag!"
-	einfo So, you installed the version for older x86 systems!
-	einfo If your CPU is greater than Intel Pentium / AMD K6,
-	einfo remove the pentium USE flag and try this version!
-	fi
-
-	if use !pentium; then
-	ewarn "If you are seeing 'illegal instruction' error when trying"
-	ewarn "to run Hamachi client, set the pentium USE flag!"
-	ewarn "It enables binaries built specifically for older"
-	ewarn "x86 platforms, like Intel Pentium or AMD K6,"
-	ewarn "with all optimizations turned off."
-	fi
-
 	einfo "To start Hamachi just type:"
 	einfo "/etc/init.d/hamachi start"
 
diff --git a/net-misc/hamachi/metadata.xml b/net-misc/hamachi/metadata.xml
index dca1bef8d738..6e5d8c8e15bb 100644
--- a/net-misc/hamachi/metadata.xml
+++ b/net-misc/hamachi/metadata.xml
@@ -7,7 +7,4 @@
   </maintainer>
   <longdescription>Hamachi is an encrypted tunneling service that allows pseudo networks to be joined together.
 </longdescription>
-  <use>
-    <flag name="pentium">Add support for older Pentium based systems</flag>
-  </use>
 </pkgmetadata>