[gentoo-commits] gentoo-x86 commit in net-misc/hamachi: hamachi-0.9.9.9_p20-r4.ebuild metadata.xml ChangeLog hamachi-0.9.9.9_p20-r2.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    09/07/31 11:03:01

  Modified:             hamachi-0.9.9.9_p20-r4.ebuild metadata.xml
                        ChangeLog
  Removed:              hamachi-0.9.9.9_p20-r2.ebuild
  Log:
  Rename pentium useflag to sse. Get rid of old ebuild. Thx to sedzimir on sunrise for patch.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.2                  net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild?r1=1.1&r2=1.2

Index: hamachi-0.9.9.9_p20-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/hamachi/hamachi-0.9.9.9_p20-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamachi-0.9.9.9_p20-r4.ebuild	31 Jul 2009 09:26:18 -0000	1.1
+++ hamachi-0.9.9.9_p20-r4.ebuild	31 Jul 2009 11:03:01 -0000	1.2
@@ -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 @@
 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 @@
 	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 @@
 }
 
 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"
 



1.4                  net-misc/hamachi/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/hamachi/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	8 Aug 2008 04:57:09 -0000	1.3
+++ metadata.xml	31 Jul 2009 11:03:01 -0000	1.4
@@ -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>



1.12                 net-misc/hamachi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hamachi/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/hamachi/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	31 Jul 2009 09:26:18 -0000	1.11
+++ ChangeLog	31 Jul 2009 11:03:01 -0000	1.12
@@ -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@g.o>
+  -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)