Fixing ggnfs default paths

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

4 files changed, 14 insertions, 50 deletions

diff --git a/sci-mathematics/yafu/ChangeLog b/sci-mathematics/yafu/ChangeLog
index 39a83f105cd6..adafeb5a2b50 100644
--- a/sci-mathematics/yafu/ChangeLog
+++ b/sci-mathematics/yafu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/yafu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/ChangeLog,v 1.5 2013/01/06 15:19:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/ChangeLog,v 1.6 2013/01/06 15:37:17 patrick Exp $
+
+*yafu-1.33-r2 (06 Jan 2013)
+
+  06 Jan 2013; Patrick Lauer <patrick@gentoo.org> +yafu-1.33-r2.ebuild,
+  -yafu-1.33-r1.ebuild, -yafu-1.33.ebuild:
+  Fixing ggnfs default paths
 
   06 Jan 2013; Patrick Lauer <patrick@gentoo.org> yafu-1.33-r1.ebuild:
   Fixing linking issue with newer msieve
diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest
index 2c0691c392bd..c11518f1e270 100644
--- a/sci-mathematics/yafu/Manifest
+++ b/sci-mathematics/yafu/Manifest
@@ -1,6 +1,5 @@
 DIST yafu-1.33-src.zip 537546 SHA256 46f5c0bb17b5a933e463805fb9a87cbef4dc1c3938d0840604cd78fded0c41be SHA512 a39f22aa8b91dfe244fe2b84b89ec8bbe0f2f8d8db99310834da387a6572f08c6bf85d05159c982a02246305ec34e2b7ac7ce2d6962a4fae0b8f8caaeaf30022 WHIRLPOOL 54e280a8f96251de9f59bf4345341c4ee88c88c298404a1aa6f5c3790a25951aa42962490969653e4dcbc3798dac57104a1084b060ce9a946f8ead53e6bc4820
-EBUILD yafu-1.33-r1.ebuild 1926 SHA256 2f1b2edb83110ec48d6d1145e5593932ef74fed139650b7af0d8fd7514a21f66 SHA512 36f63e2c37ba42e63594dd0b42ee4505161ac7e6688073ab0f5205afe1a1ad3a92d0a1053b8c7be7031e81d94ee72be9bb1a78acb7faf83bd3e17967207787f9 WHIRLPOOL 67722ff52f15a55ec3c12a66d5f4c658baee1d2d46083df2aa13f02c59aba2b7a2b771c6667c288fe5a4427fcd010faf78c21826eebe731df428c7e63a769a7d
-EBUILD yafu-1.33.ebuild 1502 SHA256 1d21ab097b8f6544fb8db8fa74ae083529ef4357815b86e69b65cffd73a44e30 SHA512 d8665518bfd88e0408e79e5f64644fbce52f1dc98dff3abc25cc94446da09f304bc0119aa4768a446ee54219de1d01493c5e916a3c2eb1816d57f09fbb40f4f6 WHIRLPOOL 6c50b877595a0734ad4eef0902f770f8e395b15f3cccc4861d10c857202e0a0007c36bf739c441f65a4a3566ddd4aaceb1dafcf016c74100ef12822731b8a013
+EBUILD yafu-1.33-r2.ebuild 2113 SHA256 1f2afd2afc2f6a3cd2a26bee3ea0b181d51d7573d05f97438986bbbdabda939a SHA512 0d38904d6db6c951434177fcabf9c6169ca4291da4fd3a01a5f1e551f168a038d78cd65e88a7d339e7aaf93bb70078381a9f47f10ba819750b3454abda4c607d WHIRLPOOL 49c5c67291ba5e67e07993d4b1288b05d8f6228e07b9ac4038b4b8f00514584535ff6a14143c0b4ec8f20f23129ccde774cc7238f37830e860ded5e4ed8f3639
 EBUILD yafu-9999.ebuild 2030 SHA256 c2f2b6f711dba8f9da27e3f8a1a6f50eaa4ee84d7b9c7e8e62aded148ae345f3 SHA512 8e00f9f7feed3e55aee878496de3aa5e899f5772ce0df68fd4ae949d750ef6e3cc0765368b187cbf660869302581d97b5d10105841c431d02b6c464384a990c1 WHIRLPOOL e60f7de72aad1a29a28b9e6dcb29d513948cc87b5a1add4ac545de8113a443bce3fa6d469528db18e1c65117de277b91bc657485a3157eda7bfedd4dcac5c92a
-MISC ChangeLog 817 SHA256 eac6033860958e5496561c6c621be91a2df72e372cebea7b7ebddd627ec9c49e SHA512 260c6d91b802e08efdd2a4d5faebc57960ee9e22c62905f5ca2ca78af65631363fe45a6b99fdf0224e3f662eb32dcfc5a8017f8b43e7086851550f5406ce757a WHIRLPOOL 062b7579b3ba9460d8ef90753301e7d6b8e370dfb4941672531fa8677b00d2e1c1e119c68f132f24e56820045b4df67be9a7f4d30142c84beadb8e8e62e2abd4
+MISC ChangeLog 991 SHA256 dd22c710105356eed01b09d18fe4cb78cac330ff9bd45d29f42a4e3ca2311bd2 SHA512 97f6e661e2e6dbbdcd3c054f3ce26a0a9aefc5f777b19b6df9f9d7d5ec6bd188c3b02ca37af61a004a294ce430ea6537567759995bca9d2c0a9f23927e259c7a WHIRLPOOL 28cd7545e8a16f9bb2051dffdc4858710d8a6b910529aff70e4e0e04247fa6c2b3fa389a70345d35eee4ba63384c5b808d495cae2154030417f2262654414fb1
 MISC metadata.xml 316 SHA256 c9ff413abee214cbf8cca8a8162d18f73b789a70e0d3009791172abbd38eeb17 SHA512 1e2b4de6935baf64a3f630220c6d961503c5efbcdb1cb47b458af9c4c59b8a778d925a803060711d67e6cebeed277f64b7b005c23ba36ea5c6796c1c65db75ba WHIRLPOOL 0209a72635b630ce44ff88b6c8af60543fe69a481acff62ececd962c5e10db9f87a38d354abff65d91e3f2b78dfce7dcfaf961f9c8e4314e88f1b613c824b525
diff --git a/sci-mathematics/yafu/yafu-1.33-r1.ebuild b/sci-mathematics/yafu/yafu-1.33-r2.ebuild
index 9b62d9071b14..a6d63db3cf36 100644
--- a/sci-mathematics/yafu/yafu-1.33-r1.ebuild
+++ b/sci-mathematics/yafu/yafu-1.33-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.33-r1.ebuild,v 1.3 2013/01/06 15:19:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.33-r2.ebuild,v 1.1 2013/01/06 15:37:17 patrick Exp $
 
 EAPI=4
 DESCRIPTION="Yet another factoring utility"
@@ -29,6 +29,10 @@ src_prepare() {
 	sed -i -e 's:\"config.h\":<gmp-ecm/config.h>:g' top/driver.c	|| die "Failed to rectify things"
 	sed -i -e 's:# LIBS += -L../msieve/lib/linux/x86_64:LIBS += -lmsieve -lz -ldl:' Makefile	|| die "Failed to rectify things"
 	sed -i -e 's:CFLAGS = -g:#CFLAGS = -g:' Makefile	|| die "Failed to rectify things"
+
+	# proper ggnfs default path
+	sed -i -e 's~strcpy(fobj->nfs_obj.ggnfs_dir,"./");~strcpy(fobj->nfs_obj.ggnfs_dir,"/usr/bin/");~' factor/factor_common.c || die "Failed to rectify things"
+
 }
 
 src_compile() {
diff --git a/sci-mathematics/yafu/yafu-1.33.ebuild b/sci-mathematics/yafu/yafu-1.33.ebuild
deleted file mode 100644
index be1868ef9e3a..000000000000
--- a/sci-mathematics/yafu/yafu-1.33.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.33.ebuild,v 1.1 2012/11/19 07:41:56 patrick Exp $
-
-EAPI=4
-DESCRIPTION="Yet another factoring utility"
-HOMEPAGE="http://sourceforge.net/projects/yafu/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-inherit eutils
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/gmp
-	sci-mathematics/gmp-ecm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# This is not nice. But then the Makefile is quite special :)
-	sed -i -e 's:../gmp/include:gmp:' Makefile 		|| die "Failed to rectify things"
-	sed -i -e 's:../gmp-ecm/include:gmp-ecm:' Makefile 	|| die "Failed to rectify things"
-	sed -i -e 's:LIBS += -L../:# LIBS += -L../:g' Makefile	|| die "Failed to rectify things"
-	sed -i -e 's:\"config.h\":<gmp-ecm/config.h>:g' top/driver.c	|| die "Failed to rectify things"
-}
-
-src_compile() {
-	if use amd64; then
-		emake x86_64 || die "Failed to build"
-	fi
-	if use x86; then
-		emake x86 || die "Failed to build"
-	fi
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin/"
-	cp "${S}/yafu" "${D}/usr/bin/" 					|| die "Failed to install"
-	mkdir -p "${D}/usr/share/doc/${PN}"
-	cp "${S}/docfile.txt" "${D}/usr/share/doc/${PN}/yafu.txt" 	|| die "Failed to install"
-	cp "${S}/README" "${D}/usr/share/doc/${PN}/"			|| die "Failed to install"
-	cp "${S}/yafu.ini" "${D}/usr/share/doc/${PN}/yafu.ini.example"	|| die "Failed to install"
-}