Version bump
authorSebastien Fabbro <bicatali@gentoo.org>
Sun, 7 Aug 2011 03:47:10 +0000 (03:47 +0000)
committerSebastien Fabbro <bicatali@gentoo.org>
Sun, 7 Aug 2011 03:47:10 +0000 (03:47 +0000)
Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

sci-libs/spqr/ChangeLog
sci-libs/spqr/Manifest
sci-libs/spqr/files/1.2.2-autotools.patch [new file with mode: 0644]
sci-libs/spqr/spqr-1.1.0.ebuild [deleted file]
sci-libs/spqr/spqr-1.1.2.ebuild [deleted file]
sci-libs/spqr/spqr-1.2.2.ebuild [moved from sci-libs/spqr/spqr-1.2.0.ebuild with 60% similarity]

index 2d536d6ada5bcd44c17a05950f55595081527e3c..eb96d29a34ce3c317c00a74aa143ee67a521dd1a 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/spqr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/ChangeLog,v 1.6 2011/02/23 20:16:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/ChangeLog,v 1.7 2011/08/07 03:47:10 bicatali Exp $
+
+*spqr-1.2.2 (07 Aug 2011)
+
+  07 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/1.2.2-autotools.patch, -spqr-1.1.0.ebuild, -spqr-1.1.2.ebuild,
+  -spqr-1.2.0.ebuild, +spqr-1.2.2.ebuild:
+  Version bump
 
 *spqr-1.2.1 (23 Feb 2011)
 
index 6c30a2fe450513c28f8817916731346a1e3f0edc..dd82792dae0e007aac7b7897056077d1364ef8d9 100644 (file)
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.2.2-autotools.patch 6568 RMD160 9192aef3735f96059cc127b6fe03fc8073019910 SHA1 a0cd5d7f7935b4a411c1c8ad58f159969a06b95f SHA256 b90bcae5b60535e67978e365af2972683ddb8d46cdc27e92e7ad5aa57d43e870
 AUX spqr-1.1.0-autotools.patch 6935 RMD160 e6f092ab13ad15f1670a04b7ee6caa747e091648 SHA1 d98f8e26804cb97065a5135f691b82652ba6382f SHA256 0684a4f959af4710b8206acd989e20214e9b2b5460bd4e61804d544eb6c30b19
 AUX spqr-1.1.0-gcc43.patch 452 RMD160 625049d879ac622f44624052a7deb2a69b340d23 SHA1 d2567224b1dfaf7181c88ecbffc4b55ee5588861 SHA256 05cecd9617d43f06cd474ed303e2a3f48b968987db314e66de2601ca82bfbacc
-DIST SPQR-1.1.0.tar.gz 1164724 RMD160 a8338be7893b0321f0ecd664dee6031503acefea SHA1 06dc48108033cb60a3402855ad9824daa103b4b3 SHA256 c71777d5f4c83d0cb91f908f82992362cf489115203f5903710896461f850cdc
-DIST SPQR-1.1.2.tar.gz 1162490 RMD160 61c295f9226527f519a062f161110590878df525 SHA1 a061b9383b965dfc9f3b50e819406c12bbfcff62 SHA256 80a7eda1a11123e9eb2609ca3578da608249c0248d8888823448c797df050eeb
-DIST SPQR-1.2.0.tar.gz 1165296 RMD160 fa0ce562cfe57a7c2c4d6502de9942d805513981 SHA1 a7107e84515a061f85632102847d56bb0471137f SHA256 ea86e0a55d4aaea95f735a1f228f62f499606240157393cc1954844cd3596a02
 DIST SPQR-1.2.1.tar.gz 1163533 RMD160 8a7d3c35575fbefa06b29b6623f1cb708a4cdf5c SHA1 941c7ffb247f2f7f5c97efa8a80640d7139e5530 SHA256 4c9d5949678743cef3b1224843d420e64875fbea6af66c322d0fa8f7b9c430b1
-EBUILD spqr-1.1.0.ebuild 1136 RMD160 4d7b654deabcae4c4af118846d59a05bb9651728 SHA1 70fea734462c5e1587f28871a54463565aee9e6c SHA256 8bee08e20d8f065c240e3c804371cd1dc8c628880d21be4b5ddf5a30adf1c565
-EBUILD spqr-1.1.2.ebuild 1150 RMD160 80837552ca76b471c8dd07738a8322cd88ada293 SHA1 d58f51491bccaa94c982c57643bd264c2233d653 SHA256 8b3cfa2261729870f447ee73cdff9086a48efd8592b89fa3fd30f3b3b09a2e64
-EBUILD spqr-1.2.0.ebuild 1199 RMD160 6e8d3b4713135be66cf01a57af60654e24e613f7 SHA1 44355435d6d9e9dfeb8e5bc037cce185ef591d8f SHA256 cee452aa1205d1f4dc55d1e0fd70868a99ef8ef2aa96149815c3f493a307746c
+DIST SPQR-1.2.2.tar.gz 1166274 RMD160 fb30f296822aa6237bb5c69d187e8f1dd23242d4 SHA1 60526599208f58bfa5541c3c8550d7400e1dec9e SHA256 4b896cd20013b6cb9ebe037ba89cbd449f1930ff0023fe35b2c08392db31388f
 EBUILD spqr-1.2.1.ebuild 1199 RMD160 925cad0cc31bd2a2386f631f393b06febcaaefc3 SHA1 e41c102d4a2b026d1defe1b200ef0dfaf601983d SHA256 950c23dc117ca172841df9929b5c600b3ac28e0699233d9335ed7648c7639a17
-MISC ChangeLog 1096 RMD160 799d53693b550b94f464eca2daeb8dee4ad599ea SHA1 4e059d9db09073d825f5e9c96e60c7b4728d82f0 SHA256 77d23ecc67775cd91d39d252044f8461ce37d445504c2d34c6f9c698468bb689
+EBUILD spqr-1.2.2.ebuild 996 RMD160 2bfc29e487c4bde0c0e43fed91b9eb9fcc4dab06 SHA1 1799687571bcced3c25776940f7d18f30096d1fc SHA256 778e9d13f3623374de4670fb3511724a983a78daf3105df06563f9a582865854
+MISC ChangeLog 1308 RMD160 b0c0d55597f430f4618ebaedf8fda361d4460ff0 SHA1 9634bf29a11c46cff22195879b0d8f784c86a522 SHA256 8282ff7a4f77d66b4ca5b88a6e7c5f73aeee58538ec7cb1481dd77ba44bed49b
 MISC metadata.xml 772 RMD160 951e96087919abb533336e45e0090d581282b5b4 SHA1 36c67de7fb8ea368069fb5330a6b46ea1900760e SHA256 f64bb3581dc2653045493b3c2f46a99ab4f3fab301572a430ca95db2e0e69422
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1la/QACgkQ1ycZbhPLE2C1NQCfRGWAqwtPYTlRntJaRX1vnQzt
-c6sAoLAVyQzEq6FO7L8DrxJ1Zw02PZ5L
-=sNR3
+iEYEARECAAYFAk4+CxcACgkQ1ycZbhPLE2BHFwCcCwqZCF3xYVpL/F/5n3rGaJ3x
+bocAn2A8kOrn/3wa2MdNeAbsjcKim0RX
+=hUb5
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/spqr/files/1.2.2-autotools.patch b/sci-libs/spqr/files/1.2.2-autotools.patch
new file mode 100644 (file)
index 0000000..d56ecdc
--- /dev/null
@@ -0,0 +1,203 @@
+--- Demo/Makefile.am   1969-12-31 19:00:00.000000000 -0500
++++ Demo/Makefile.am   2009-10-22 23:42:08.000000000 -0400
+@@ -0,0 +1,78 @@
++AM_CPPFLAGS = -I$(top_srcdir)/Include
++
++LDADD = $(top_builddir)/Source/libspqr.la \
++      $(CHOLMOD_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \
++      $(COLAMD_LIBS) $(CCOLAMD_LIBS) \
++      $(METIS_LIBS) $(BLAS_LIBS) $(LAPACK_LIBS) $(TBB_LIBS)
++
++check_PROGRAMS = \
++      qrsimple qrsimplec \
++      qrdemo qrdemoc
++
++qrsimple_SOURCES = qrsimple.cpp
++qrsimplec = qrsimplec.c
++qrsimplec_CFLAGS = -ansi
++qrdemo_SOURCES = qrdemo.cpp
++qrdemoc_SOURCES = qrdemoc.c
++qrdemoc_CFLAGS = -ansi
++
++
++check-local: $(check_PROGRAMS)
++      ./qrsimple < ../Matrix/ash219.mtx || exit 1
++      ./qrsimplec < ../Matrix/ash219.mtx || exit 1
++      ./qrsimple < ../Matrix/west0067.mtx || exit 1
++      ./qrsimplec < ../Matrix/west0067.mtx || exit 1
++      ./qrdemo < ../Matrix/a2.mtx || exit 1
++      ./qrdemo < ../Matrix/r2.mtx || exit 1
++      ./qrdemo < ../Matrix/a04.mtx || exit 1
++      ./qrdemo < ../Matrix/a2.mtx || exit 1
++      ./qrdemo < ../Matrix/west0067.mtx || exit 1
++      ./qrdemo < ../Matrix/c2.mtx || exit 1
++      ./qrdemo < ../Matrix/a0.mtx || exit 1
++      ./qrdemo < ../Matrix/lfat5b.mtx || exit 1
++      ./qrdemo < ../Matrix/bfwa62.mtx || exit 1
++      ./qrdemo < ../Matrix/LFAT5.mtx || exit 1
++      ./qrdemo < ../Matrix/b1_ss.mtx || exit 1
++      ./qrdemo < ../Matrix/bcspwr01.mtx || exit 1
++      ./qrdemo < ../Matrix/lpi_galenet.mtx || exit 1
++      ./qrdemo < ../Matrix/lpi_itest6.mtx || exit 1
++      ./qrdemo < ../Matrix/ash219.mtx || exit 1
++      ./qrdemo < ../Matrix/a4.mtx || exit 1
++      ./qrdemo < ../Matrix/s32.mtx || exit 1
++      ./qrdemo < ../Matrix/c32.mtx || exit 1
++      ./qrdemo < ../Matrix/lp_share1b.mtx || exit 1
++      ./qrdemo < ../Matrix/a1.mtx || exit 1
++      ./qrdemo < ../Matrix/GD06_theory.mtx || exit 1
++      ./qrdemo < ../Matrix/GD01_b.mtx || exit 1
++      ./qrdemo < ../Matrix/Tina_AskCal_perm.mtx || exit 1
++      ./qrdemo < ../Matrix/Tina_AskCal.mtx || exit 1
++      ./qrdemo < ../Matrix/GD98_a.mtx || exit 1
++      ./qrdemo < ../Matrix/Ragusa16.mtx || exit 1
++      ./qrdemo < ../Matrix/young1c.mtx || exit 1
++      ./qrdemoc < ../Matrix/a2.mtx || exit 1
++      ./qrdemoc < ../Matrix/r2.mtx || exit 1
++      ./qrdemoc < ../Matrix/a04.mtx || exit 1
++      ./qrdemoc < ../Matrix/a2.mtx || exit 1
++      ./qrdemoc < ../Matrix/west0067.mtx || exit 1
++      ./qrdemoc < ../Matrix/c2.mtx || exit 1
++      ./qrdemoc < ../Matrix/a0.mtx || exit 1
++      ./qrdemoc < ../Matrix/lfat5b.mtx || exit 1
++      ./qrdemoc < ../Matrix/bfwa62.mtx || exit 1
++      ./qrdemoc < ../Matrix/LFAT5.mtx || exit 1
++      ./qrdemoc < ../Matrix/b1_ss.mtx || exit 1
++      ./qrdemoc < ../Matrix/bcspwr01.mtx || exit 1
++      ./qrdemoc < ../Matrix/lpi_galenet.mtx || exit 1
++      ./qrdemoc < ../Matrix/lpi_itest6.mtx || exit 1
++      ./qrdemoc < ../Matrix/ash219.mtx || exit 1
++      ./qrdemoc < ../Matrix/a4.mtx || exit 1
++      ./qrdemoc < ../Matrix/s32.mtx || exit 1
++      ./qrdemoc < ../Matrix/c32.mtx || exit 1
++      ./qrdemoc < ../Matrix/lp_share1b.mtx || exit 1
++      ./qrdemoc < ../Matrix/a1.mtx || exit 1
++      ./qrdemoc < ../Matrix/GD06_theory.mtx || exit 1
++      ./qrdemoc < ../Matrix/GD01_b.mtx || exit 1
++      ./qrdemoc < ../Matrix/Tina_AskCal_perm.mtx || exit 1
++      ./qrdemoc < ../Matrix/Tina_AskCal.mtx || exit 1
++      ./qrdemoc < ../Matrix/GD98_a.mtx || exit 1
++      ./qrdemoc < ../Matrix/Ragusa16.mtx || exit 1
++      ./qrdemoc < ../Matrix/young1c.mtx || exit 1
+--- Include/Makefile.am        1969-12-31 19:00:00.000000000 -0500
++++ Include/Makefile.am        2009-10-22 23:42:08.000000000 -0400
+@@ -0,0 +1,5 @@
++include_HEADERS = \
++      spqr.hpp \
++      SuiteSparseQR_C.h \
++      SuiteSparseQR_definitions.h \
++      SuiteSparseQR.hpp
+--- Makefile.am        1969-12-31 19:00:00.000000000 -0500
++++ Makefile.am        2009-10-22 23:42:08.000000000 -0400
+@@ -0,0 +1,2 @@
++SUBDIRS = Include Source Demo
++EXTRA_DIST = README.txt
+--- Source/Makefile.am 1969-12-31 19:00:00.000000000 -0500
++++ Source/Makefile.am 2009-10-22 23:43:03.000000000 -0400
+@@ -0,0 +1,48 @@
++AM_CPPFLAGS=-I$(top_srcdir)/Include
++
++lib_LTLIBRARIES = libspqr.la
++
++libspqr_la_SOURCES = \
++    spqr_rmap.cpp \
++    SuiteSparseQR_C.cpp \
++    SuiteSparseQR_expert.cpp \
++    spqr_parallel.cpp \
++    spqr_kernel.cpp \
++    spqr_analyze.cpp \
++    spqr_assemble.cpp \
++    spqr_cpack.cpp \
++    spqr_csize.cpp \
++    spqr_fcsize.cpp \
++    spqr_debug.cpp \
++    spqr_front.cpp \
++    spqr_factorize.cpp \
++    spqr_freenum.cpp \
++    spqr_freesym.cpp \
++    spqr_freefac.cpp \
++    spqr_fsize.cpp \
++    spqr_maxcolnorm.cpp \
++    spqr_rconvert.cpp \
++    spqr_rcount.cpp \
++    spqr_rhpack.cpp \
++    spqr_rsolve.cpp \
++    spqr_stranspose1.cpp \
++    spqr_stranspose2.cpp \
++    spqr_hpinv.cpp \
++    spqr_1fixed.cpp \
++    spqr_1colamd.cpp \
++    SuiteSparseQR.cpp \
++    spqr_1factor.cpp \
++    spqr_cumsum.cpp \
++    spqr_shift.cpp \
++    spqr_happly.cpp \
++    spqr_panel.cpp \
++    spqr_happly_work.cpp \
++    SuiteSparseQR_qmult.cpp \
++    spqr_trapezoidal.cpp \
++    spqr_larftb.cpp \
++    spqr_append.cpp \
++    spqr_type.cpp \
++    spqr_tol.cpp
++
++libspqr_la_CPPFLAGS = $(AM_CPPFLAGS) $(METIS_CFLAGS) $(TBB_CFLAGS) $(LAPACK_CFLAGS)
++libspqr_la_LIBADD = $(METIS_LIBS) $(TBB_LIBS) $(LAPACK_LIBS)
+--- configure.ac       1969-12-31 19:00:00.000000000 -0500
++++ configure.ac       2009-10-22 23:42:32.000000000 -0400
+@@ -0,0 +1,55 @@
++AC_PREREQ(2.59)
++AC_INIT(spqr, 1.2.2, davis@cise.ufl.edu)
++AM_INIT_AUTOMAKE([foreign])
++AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
++AM_INIT_AUTOMAKE([foreign])
++
++AC_PROG_LIBTOOL
++AC_PROG_CXX
++AC_LANG(C++)
++
++AC_CHECK_LIB(m, sqrt)
++AC_CHECK_LIB(lapack,zlarft_)
++AC_CHECK_HEADERS(UFconfig.h)
++AC_CHECK_HEADERS(cholmod.h)
++AC_CHECK_LIB(cholmod, cholmod_solve, [], \
++            [AC_MSG_ERROR([Cannot find libcholmod])])
++
++AC_ARG_WITH(metis,
++    [AC_HELP_STRING([--with-metis],
++                  [Use METIS for partitioning])],
++     [with_metis=$withval],
++     [with_metis="yes"])
++if test x$with_metis = xyes; then
++    PKG_PROG_PKG_CONFIG
++    if test -n "$PKG_CONFIG"; then
++       PKG_CHECK_MODULES([metis], [metis])
++    else
++      AC_CHECK_HEADERS(metis.h)
++      AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
++              [AC_MSG_ERROR([Cannot find libmetis])])
++    fi
++    AC_DEFINE(NPARTITION)
++fi
++AM_CONDITIONAL([METIS], [test x$with_metis = xyes])
++
++AC_ARG_WITH(tbb,
++    [AC_HELP_STRING([--with-tbb],
++                  [Use Intel Threading Building Block for multithreading])],
++     [with_tbb=$withval],
++     [with_tbb="yes"])
++if test x$with_tbb = xyes; then
++    AC_CHECK_HEADERS(tbb/task.h)
++    TBB_CFLAGS=""
++    TBB_LIBS="-ltbb"
++    AC_SUBST(TBB_CFLAGS)
++    AC_SUBST(TBB_LIBS)
++    AC_DEFINE(HAVE_TBB)
++fi
++AM_CONDITIONAL([WITH_TBB], [test x$with_tbb = xyes])
++
++AC_CONFIG_FILES([Makefile
++    Source/Makefile
++    Include/Makefile
++    Demo/Makefile])
++AC_OUTPUT
diff --git a/sci-libs/spqr/spqr-1.1.0.ebuild b/sci-libs/spqr/spqr-1.1.0.ebuild
deleted file mode 100644 (file)
index e347459..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.1.0.ebuild,v 1.2 2009/10/23 03:48:29 markusle Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MY_PN=SPQR
-DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc metis tbb"
-RDEPEND="sci-libs/cholmod[supernodal]
-       tbb? ( dev-cpp/tbb )
-       metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-       cd "${WORKDIR}"
-       epatch "${FILESDIR}"/${P}-autotools.patch
-       epatch "${FILESDIR}"/${P}-gcc43.patch
-       cd "${S}"
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               $(use_with metis) \
-               $(use_with tbb)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins Doc/*.pdf || die
-       fi
-}
diff --git a/sci-libs/spqr/spqr-1.1.2.ebuild b/sci-libs/spqr/spqr-1.1.2.ebuild
deleted file mode 100644 (file)
index 73aab76..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.1.2.ebuild,v 1.1 2009/11/21 07:58:34 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MY_PN=SPQR
-DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc metis tbb"
-RDEPEND="sci-libs/cholmod[supernodal]
-       tbb? ( dev-cpp/tbb )
-       metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-       cd "${WORKDIR}"
-       epatch "${FILESDIR}"/${PN}-1.1.0-autotools.patch
-       epatch "${FILESDIR}"/${PN}-1.1.0-gcc43.patch
-       cd "${S}"
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               $(use_with metis) \
-               $(use_with tbb)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins Doc/*.pdf || die
-       fi
-}
similarity index 60%
rename from sci-libs/spqr/spqr-1.2.0.ebuild
rename to sci-libs/spqr/spqr-1.2.2.ebuild
index 612723554c0ef11cb44c2c6ac9a3ee15b96779fd..9c14cf026b6d6353541b68c1a66be287f07fcbb3 100644 (file)
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.2.0.ebuild,v 1.2 2010/12/25 18:51:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.2.2.ebuild,v 1.1 2011/08/07 03:47:10 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils autotools
 
 MY_PN=SPQR
@@ -23,10 +23,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}"
 
 src_prepare() {
-       cd "${WORKDIR}"
-       epatch "${FILESDIR}"/${PN}-1.1.0-autotools.patch
-       epatch "${FILESDIR}"/${PN}-1.1.0-gcc43.patch
-       cd "${S}"
+       epatch "${FILESDIR}"/${PV}-autotools.patch
        eautoreconf
 }
 
@@ -38,10 +35,7 @@ src_configure() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins Doc/*.pdf || die
-       fi
+       default
+       dodoc README.txt Doc/ChangeLog
+       use doc && doins Doc/*.pdf
 }