summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-08 19:21:03 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-08 19:21:03 +0000
commit3da182733de899e20c4bda8df309bf2a502ba5d8 (patch)
tree3560486a7e13e566af209f894db015a024f8dcd2 /app-text/libpaper
parentVersion bump (diff)
downloadgentoo-2-3da182733de899e20c4bda8df309bf2a502ba5d8.tar.gz
gentoo-2-3da182733de899e20c4bda8df309bf2a502ba5d8.tar.bz2
gentoo-2-3da182733de899e20c4bda8df309bf2a502ba5d8.zip
Add ~amd64 and ~x86-fbsd keywords, add patch to build on FreeBSd, add elibtoolize.
(Portage version: 2.1_pre10-r4)
Diffstat (limited to 'app-text/libpaper')
-rw-r--r--app-text/libpaper/ChangeLog7
-rw-r--r--app-text/libpaper/files/libpaper-1.1.14.8-malloc.patch12
-rw-r--r--app-text/libpaper/libpaper-1.1.14.8.ebuild10
3 files changed, 25 insertions, 4 deletions
diff --git a/app-text/libpaper/ChangeLog b/app-text/libpaper/ChangeLog
index 71df9acded4b..8cb4fcc89b09 100644
--- a/app-text/libpaper/ChangeLog
+++ b/app-text/libpaper/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/libpaper
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/ChangeLog,v 1.1 2006/05/08 18:40:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/ChangeLog,v 1.2 2006/05/08 19:21:03 flameeyes Exp $
+
+ 08 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/libpaper-1.1.14.8-malloc.patch, libpaper-1.1.14.8.ebuild:
+ Add ~amd64 and ~x86-fbsd keywords, add patch to build on FreeBSd, add
+ elibtoolize.
*libpaper-1.1.14.8 (08 May 2006)
diff --git a/app-text/libpaper/files/libpaper-1.1.14.8-malloc.patch b/app-text/libpaper/files/libpaper-1.1.14.8-malloc.patch
new file mode 100644
index 000000000000..ca96a38feab2
--- /dev/null
+++ b/app-text/libpaper/files/libpaper-1.1.14.8-malloc.patch
@@ -0,0 +1,12 @@
+Index: libpaper-1.1.14ubuntu8/lib/paper.c
+===================================================================
+--- libpaper-1.1.14ubuntu8.orig/lib/paper.c
++++ libpaper-1.1.14ubuntu8/lib/paper.c
+@@ -14,7 +14,6 @@
+ #include <sys/stat.h>
+
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
+
diff --git a/app-text/libpaper/libpaper-1.1.14.8.ebuild b/app-text/libpaper/libpaper-1.1.14.8.ebuild
index 8fb8bfc7762f..b2164bd385d1 100644
--- a/app-text/libpaper/libpaper-1.1.14.8.ebuild
+++ b/app-text/libpaper/libpaper-1.1.14.8.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.14.8.ebuild,v 1.1 2006/05/08 18:40:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.14.8.ebuild,v 1.2 2006/05/08 19:21:03 flameeyes Exp $
-inherit versionator
+inherit versionator libtool eutils
MY_P="libpaper_$(replace_version_separator 3 ubuntu)"
DESCRIPTION="Library for handling paper characteristics"
@@ -11,7 +11,7 @@ SRC_URI="http://archive.ubuntu.com/ubuntu/pool/main/libp/libpaper/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
IUSE=""
S=${WORKDIR}/${MY_P/_/-}
@@ -21,6 +21,10 @@ src_unpack() {
cd ${S}
ln -s /usr/share/libtool/config.sub
ln -s /usr/share/libtool/config.guess
+
+ epatch "${FILESDIR}/${P}-malloc.patch"
+
+ elibtoolize
}
src_install() {