Commits

松井 鉄史 committed cb8a2ab

4ti2-1.3.2: fix header installation

  • Participants
  • Parent commits 7811ee6

Comments (0)

Files changed (4)

sci-mathematics/4ti2/4ti2-1.3.2.ebuild

 
 EAPI=2
 
+inherit autotools
+
 DESCRIPTION="software package for algebraic, geometric and combinatorial problems"
 HOMEPAGE="http://www.4ti2.de"
 SRC_URI="http://4ti2.de/version_1.3.2/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86-macos"
 IUSE=""
 DEPEND="sci-mathematics/glpk[gmp]
 dev-libs/gmp[-nocxx]"
 
 ## This package seems to work with everything default
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-HEADERS.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${P}-m4.patch" || die "epatch failed"
+
+	cd "${S}"
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-}
+}

sci-mathematics/4ti2/Manifest

+AUX 4ti2-1.3.2-HEADERS.patch 6195 RMD160 2f53dd23035b421798d17291a24298c05f75d9ef SHA1 6188eddfc9f42c0888ded26b84a676f29972928a SHA256 a83e010fea636c0f6a7e3067f8ed5adf419e6ab4e9f854cfbc99578165d4a6eb
+AUX 4ti2-1.3.2-m4.patch 261 RMD160 654676373649724416a66ccb3f1781e5b6336c0b SHA1 58c34ab4f6a09536abe70e248dedbbc1131e2c02 SHA256 b597cd0fb38ae409cf39a16854cecebe0fd890bd6f04b97a1aeaf711867b2675
 DIST 4ti2-1.3.2.tar.gz 4658600 RMD160 e3c5994f458912553988cd113fb9ce1f51c17fe6 SHA1 bb0bddb3a9de6f6ceeee7e296b5315b8b7e59ea5 SHA256 30f15696105b5cfa0784d2f7f9a310ef67d616d2367e064c85ba36ec9a20a066
-EBUILD 4ti2-1.3.2.ebuild 560 RMD160 8969e0d506a4b233c80c884746862df0ab2455fc SHA1 d954fc874f57778bf6b7be050990fc35c602c811 SHA256 5a8f9e503af00f7b08eb0c2b367f22ee282898b18a92a0632114ba53ec14e1a2
+EBUILD 4ti2-1.3.2.ebuild 746 RMD160 435712a802868afffa0a0e6a55ac8573cdae63f1 SHA1 34dde76a05694bd8eb18bdf0058fd9c8342725aa SHA256 452821c58eb26a4926b3c83ab00f58fbdd351d24ed3352e2d1e2b500a89c6024
 MISC ChangeLog 316 RMD160 dbd5dcd7970ceda327ec87fc8e2a83314c62db43 SHA1 8d0be815e250175ba698bf5317b1a10363606e30 SHA256 28790895f0bbf7d71c2e1aff6215bc74f2a7eafd2b1d182815c942beab5bca74
 MISC metadata.xml 407 RMD160 b56723a4946cc11ee2b137f85dda1b95855937a7 SHA1 0bb46a9862771e10ba7e5c1e323d6ef39731f5df SHA256 3efd7aa88bf1706dabf23d92f89439acd521386d3c5082477ff5089333a0cdc5

sci-mathematics/4ti2/files/4ti2-1.3.2-HEADERS.patch

+diff -ur src.orig/Makefile.am src/Makefile.am
+--- src.orig/Makefile.am	2008-11-15 11:08:37 +0900
++++ src/Makefile.am	2010-02-14 02:41:01 +0900
+@@ -18,11 +18,112 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 
+ 
+ SUBDIRS = ppi util
++nobase_include_HEADERS =
+ if ENABLE_GROEBNER
+ SUBDIRS += groebner
++nobase_include_HEADERS += 				\
++	groebner/Algorithm.h				\
++	groebner/BasicCompletion.h			\
++	groebner/BasicGeneration.h			\
++	groebner/BasicOptions.h				\
++	groebner/BasicReduction.h			\
++	groebner/BinomialArray.h			\
++	groebner/BinomialArrayStream.h			\
++	groebner/BinomialCollection.h			\
++	groebner/BinomialFactory.h			\
++	groebner/Binomial.h				\
++	groebner/BinomialSet.h				\
++	groebner/BinomialSetStream.h			\
++	groebner/BinomialStream.h			\
++	groebner/BitSet.h				\
++	groebner/BitSetStream.h				\
++	groebner/Bounded.h				\
++	groebner/CircuitAlgorithm.h			\
++	groebner/CircuitImplementation.h		\
++	groebner/CircuitMatrixAlgorithm.h		\
++	groebner/CircuitOptions.h			\
++	groebner/CircuitSupportAlgorithm.h		\
++	groebner/Completion.h				\
++	groebner/DataType.h				\
++	groebner/Debug.h				\
++	groebner/DiagonalAlgorithm.h			\
++	groebner/EliminateAlgorithm.h			\
++	groebner/Euclidean.h				\
++	groebner/Extract.h				\
++	groebner/Feasible.h				\
++	groebner/FeasibleStream.h			\
++	groebner/Filter.h				\
++	groebner/FilterReduction.h			\
++	groebner/FlipCompletion.h			\
++	groebner/GeneratingSet.h			\
++	groebner/Generation.h				\
++	groebner/Globals.h				\
++	groebner/Grading.h				\
++	groebner/GroebnerBasis.h			\
++	groebner/HermiteAlgorithm.h			\
++	groebner/HybridGenSet.h				\
++	groebner/IndexBinomialSet.h			\
++	groebner/Index.h				\
++	groebner/IndexSetConverter.h			\
++	groebner/LatticeBasis.h				\
++	groebner/LongDenseIndexSet.h			\
++	groebner/LongDenseIndexSetStream.h		\
++	groebner/Markov.h				\
++	groebner/MaxMinGenSet.h				\
++	groebner/Minimize.h				\
++	groebner/MinimizeOptions.h			\
++	groebner/OnesReduction.h			\
++	groebner/OnesTree.h				\
++	groebner/Optimise.h				\
++	groebner/Options.h				\
++	groebner/OrderedCompletion.h			\
++	groebner/Permutation.h				\
++	groebner/ProjectLiftGenSet.h			\
++	groebner/RayAlgorithm.h				\
++	groebner/RayImplementation.h			\
++	groebner/RayMatrixAlgorithm.h			\
++	groebner/RaySupportAlgorithm.h			\
++	groebner/Reduction.h				\
++	groebner/SaturationGenSet.h			\
++	groebner/ShortDenseIndexSet.h			\
++	groebner/ShortDenseIndexSetStream.h		\
++	groebner/SignPattern.h				\
++	groebner/Size.h					\
++	groebner/Statistics.h				\
++	groebner/SupportTree.h				\
++	groebner/SyzygyCompletion.h			\
++	groebner/SyzygyGeneration.h			\
++	groebner/TermOrder.h				\
++	groebner/Timer.h				\
++	groebner/Truncate.h				\
++	groebner/VectorArray.h				\
++	groebner/VectorArrayStream.h			\
++	groebner/Vector.h				\
++	groebner/VectorStream.h				\
++	groebner/WalkAlgorithm.h			\
++	groebner/WalkOptions.h				\
++	groebner/WeightAlgorithm.h			\
++	groebner/WeightedBinomialSet.h			\
++	groebner/WeightedReduction.h			\
++	groebner/Weight.h
+ endif
+ if ENABLE_ZSOLVE
+ SUBDIRS += zsolve
++nobase_include_HEADERS += 				\
++	zsolve/cputime.h				\
++	zsolve/defs.h					\
++	zsolve/indexarray.h				\
++	zsolve/lattice.h				\
++	zsolve/libzsolve.h				\
++	zsolve/linearsystem.h				\
++	zsolve/matrix.h				\
++	zsolve/opts.h					\
++	zsolve/valuetrees.h				\
++	zsolve/varproperties.h				\
++	zsolve/vectorarray.h				\
++	zsolve/vector.h
+ endif
+ 
+ noinst_HEADERS = banner.h
++
++includedir = @includedir@/4ti2
+diff -ur src.orig/groebner/Makefile.am src/groebner/Makefile.am
+--- src.orig/groebner/Makefile.am	2008-12-17 13:59:25 +0900
++++ src/groebner/Makefile.am	2010-02-14 01:07:04 +0900
+@@ -106,92 +106,6 @@
+ 	WeightedBinomialSet.cpp			\
+ 	WeightedReduction.cpp
+ 
+-include_HEADERS = 				\
+-	Algorithm.h				\
+-	BasicCompletion.h			\
+-	BasicGeneration.h			\
+-	BasicOptions.h				\
+-	BasicReduction.h			\
+-	BinomialArray.h				\
+-	BinomialArrayStream.h			\
+-	BinomialCollection.h			\
+-	BinomialFactory.h			\
+-	Binomial.h				\
+-	BinomialSet.h				\
+-	BinomialSetStream.h			\
+-	BinomialStream.h			\
+-	BitSet.h				\
+-	BitSetStream.h				\
+-	Bounded.h				\
+-	CircuitAlgorithm.h			\
+-	CircuitImplementation.h			\
+-	CircuitMatrixAlgorithm.h		\
+-	CircuitOptions.h			\
+-	CircuitSupportAlgorithm.h		\
+-	Completion.h				\
+-	DataType.h				\
+-	Debug.h					\
+-	DiagonalAlgorithm.h			\
+-	EliminateAlgorithm.h			\
+-	Euclidean.h				\
+-	Extract.h				\
+-	Feasible.h				\
+-	FeasibleStream.h			\
+-	Filter.h				\
+-	FilterReduction.h			\
+-	FlipCompletion.h			\
+-	GeneratingSet.h				\
+-	Generation.h				\
+-	Globals.h				\
+-	Grading.h				\
+-	GroebnerBasis.h				\
+-	HermiteAlgorithm.h			\
+-	HybridGenSet.h				\
+-	IndexBinomialSet.h			\
+-	Index.h					\
+-	IndexSetConverter.h			\
+-	LatticeBasis.h				\
+-	LongDenseIndexSet.h			\
+-	LongDenseIndexSetStream.h		\
+-	Markov.h				\
+-	MaxMinGenSet.h				\
+-	Minimize.h				\
+-	MinimizeOptions.h			\
+-	OnesReduction.h				\
+-	OnesTree.h				\
+-	Optimise.h				\
+-	Options.h				\
+-	OrderedCompletion.h			\
+-	Permutation.h				\
+-	ProjectLiftGenSet.h			\
+-	RayAlgorithm.h				\
+-	RayImplementation.h			\
+-	RayMatrixAlgorithm.h			\
+-	RaySupportAlgorithm.h			\
+-	Reduction.h				\
+-	SaturationGenSet.h			\
+-	ShortDenseIndexSet.h			\
+-	ShortDenseIndexSetStream.h		\
+-	SignPattern.h				\
+-	Size.h					\
+-	Statistics.h				\
+-	SupportTree.h				\
+-	SyzygyCompletion.h			\
+-	SyzygyGeneration.h			\
+-	TermOrder.h				\
+-	Timer.h					\
+-	Truncate.h				\
+-	VectorArray.h				\
+-	VectorArrayStream.h			\
+-	Vector.h				\
+-	VectorStream.h				\
+-	WalkAlgorithm.h				\
+-	WalkOptions.h				\
+-	WeightAlgorithm.h			\
+-	WeightedBinomialSet.h			\
+-	WeightedReduction.h			\
+-	Weight.h
+-
+ # These files are #include'd C++ files.
+ noinst_HEADERS = 				\
+ 	CircuitImplementation.tpp		\
+diff -ur src.orig/zsolve/Makefile.am src/zsolve/Makefile.am
+--- src.orig/zsolve/Makefile.am	2008-11-15 11:08:37 +0900
++++ src/zsolve/Makefile.am	2010-02-14 01:08:36 +0900
+@@ -36,20 +36,6 @@
+ 	cputime.c 				\
+ 	libzsolve.c
+ 
+-include_HEADERS =				\
+-	cputime.h				\
+-	defs.h					\
+-	indexarray.h				\
+-	lattice.h				\
+-	libzsolve.h				\
+-	linearsystem.h				\
+-	matrix.h				\
+-	opts.h					\
+-	valuetrees.h				\
+-	varproperties.h				\
+-	vectorarray.h				\
+-	vector.h
+-
+ bin_PROGRAMS = zsolve
+ 
+ zsolve_SOURCES = 				\

sci-mathematics/4ti2/files/4ti2-1.3.2-m4.patch

+--- m4/glpk-check.m4.orig	2010-02-14 02:55:58 +0900
++++ m4/glpk-check.m4	2010-02-14 02:58:08 +0900
+@@ -27,7 +27,7 @@
+ BACKUP_LIBS=${LIBS}
+ BACKUP_CXX=${CXX}
+ 
+-CXX="./libtool --mode=link ${CXX}"
++CXX="glibtool --mode=link ${CXX}"
+ 
+ AC_MSG_CHECKING(for GLPK)
+