summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Szymaniak <lazy_bum@o2.pl>2011-06-26 13:56:31 +0000
committerPiotr Szymaniak <lazy_bum@o2.pl>2011-06-26 13:56:31 +0000
commit3573e1d051a5e5ded59015faaf0dbae18bfaa816 (patch)
tree1fa0309fb4240e2b0bf39a079ec8d71a14099c53
parentdev-libs/librets: New ebuild for bug 371707 thanks to mgorny for the review. (diff)
downloadsunrise-3573e1d051a5e5ded59015faaf0dbae18bfaa816.tar.gz
sunrise-3573e1d051a5e5ded59015faaf0dbae18bfaa816.tar.bz2
sunrise-3573e1d051a5e5ded59015faaf0dbae18bfaa816.zip
Added gcc-4.6 patch, moved to EAPI=4, lots of other small fixes.
svn path=/sunrise/; revision=12159
-rw-r--r--app-text/docfrac/Manifest3
-rw-r--r--app-text/docfrac/docfrac-3.1.5.ebuild28
-rw-r--r--app-text/docfrac/files/3.1.5-gcc46.patch11
3 files changed, 25 insertions, 17 deletions
diff --git a/app-text/docfrac/Manifest b/app-text/docfrac/Manifest
index 42f4c54a9..03f9e9ea0 100644
--- a/app-text/docfrac/Manifest
+++ b/app-text/docfrac/Manifest
@@ -1,4 +1,5 @@
+AUX 3.1.5-gcc46.patch 353 RMD160 190f301a08f2cf2a813c9782d83a30b6dac27786 SHA1 adfa620abe8b48a072b243e239d5e2a0cd8d726e SHA256 16f61ab2a6cc78b8366bb189d8f757a5ea8e4e2d52ca41eee35fca8581c32299
DIST docfrac-3.1.5.src.tar.gz 94523 RMD160 5068874a069c961d1540f1b3bd44be6abecb89ce SHA1 0d0f71c7fd3fcfa03d2b1c0576711efdc5d61acd SHA256 e5815891fe021d8c305faf84d13425cf7cd6881a1673b482863f500cbb217e13
-EBUILD docfrac-3.1.5.ebuild 800 RMD160 04fcfea5325369bd9ba8ec0a91a917690995c2af SHA1 b6a067e40ba0c7a8ed852b4aef7d1f8531243d92 SHA256 b3614918034e4d1d3c4ba47c605f223c3129395142440d99ea385ef4fd064f82
+EBUILD docfrac-3.1.5.ebuild 724 RMD160 808440454fb664ff0d92ea71057201fff62cb7f2 SHA1 a233dfec855668f5f74b3a7b2f8022314a9fab5b SHA256 a9152093d4d61bbb88cc962d410019162d1d3bdc129ccac31c6c722ed56e2bc8
MISC ChangeLog 352 RMD160 ea7672c8280f06b403b87c624b1308e49f8190d7 SHA1 a4b1f36e39210d54642e06e64d6a8282064a7cfc SHA256 99685eaa8ff2b004ee9bf078d9e386699fc9ab6baaa39c982740fcc6b25cf94d
MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/app-text/docfrac/docfrac-3.1.5.ebuild b/app-text/docfrac/docfrac-3.1.5.ebuild
index fb7093f64..90a53ac2c 100644
--- a/app-text/docfrac/docfrac-3.1.5.ebuild
+++ b/app-text/docfrac/docfrac-3.1.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit toolchain-funcs
+EAPI=4
+
+inherit eutils toolchain-funcs
DESCRIPTION="rtf/html/text conversion utility"
HOMEPAGE="http://docfrac.sourceforge.net/"
@@ -13,30 +15,24 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
RDEPEND=""
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
sed -i \
-e "/CPPFLAGS=/s:-.*::" \
-e "s:ar -:$(tc-getAR) -:" \
- -e "s:g++ -:$(tc-getCXX) -:g" Makefile \
- || die "sed failed in Makefile"
-}
+ -e "s:g++ -:$(tc-getCXX) -:g" \
+ Makefile || die "sed failed in Makefile"
-src_compile() {
- make docfrac || die "emake failed"
+ epatch "${FILESDIR}"/${PV}-gcc46.patch
}
-src_test() {
- make testhtml testtxt test || die "some tests failed"
+src_compile() {
+ emake ${PN}
}
src_install() {
# manual install because Makefile doesn't respect DESTDIR
- dobin docfrac
- doman doc/docfrac.1
+ dobin ${PN}
+ doman doc/${PN}.1
}
diff --git a/app-text/docfrac/files/3.1.5-gcc46.patch b/app-text/docfrac/files/3.1.5-gcc46.patch
new file mode 100644
index 000000000..a67cf72c3
--- /dev/null
+++ b/app-text/docfrac/files/3.1.5-gcc46.patch
@@ -0,0 +1,11 @@
+diff --git a/shared_ptr.h b/shared_ptr.h
+index b291449..bd23979 100755
+--- a/shared_ptr.h
++++ b/shared_ptr.h
+@@ -1,5 +1,5 @@
+ //---------------------------------------------------------------------------
+-
++#include <cstdlib>
+ #ifndef shared_ptrH
+ #define shared_ptrH
+ //---------------------------------------------------------------------------