root
9 years ago
parent
1ebd36442d
commit
1431b3e605
@ -0,0 +1,27 @@
|
||||
From 41aa99a1886fa07aad5716fb4905843ecfcbffb2 Mon Sep 17 00:00:00 2001
|
||||
From: Kristian Fiskerstrand <kristian.fiskerstrand@sumptuouscapital.com>
|
||||
Date: Fri, 18 Sep 2015 17:22:11 +0200
|
||||
Subject: [PATCH] Disable Qt5 support to force Qt4 for now
|
||||
|
||||
Automagic applies in detecting Qt5 which makes dependency specification
|
||||
difficult. Disabling the auto-detection for Qt5 and keeping Qt4 for now
|
||||
---
|
||||
m4/qt.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/qt.m4 b/m4/qt.m4
|
||||
index 0a7ea99..e7abfcc 100644
|
||||
--- a/m4/qt.m4
|
||||
+++ b/m4/qt.m4
|
||||
@@ -30,7 +30,7 @@ AC_DEFUN([FIND_QT],
|
||||
[
|
||||
PKG_CHECK_MODULES(PINENTRY_QT,
|
||||
Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
|
||||
- [have_qt5_libs="yes"],
|
||||
+ [have_qt5_libs="no"],
|
||||
[have_qt5_libs="no"])
|
||||
|
||||
if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
|
||||
--
|
||||
2.4.6
|
||||
|
||||
@ -0,0 +1,93 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
|
||||
HOMEPAGE="http://gnupg.org/aegypten2/index.html"
|
||||
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="emacs gtk ncurses qt4 caps gnome-keyring static"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libgpg-error-1.17
|
||||
>=dev-libs/libassuan-2
|
||||
app-eselect/eselect-pinentry
|
||||
caps? ( sys-libs/libcap )
|
||||
gtk? ( x11-libs/gtk+:2 )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
qt4? ( >=dev-qt/qtgui-4.4.1:4 )
|
||||
static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
gnome-keyring? ( app-crypt/libsecret )
|
||||
"
|
||||
REQUIRED_USE="
|
||||
|| ( ncurses gtk qt4 )
|
||||
gtk? ( !static )
|
||||
qt4? ( !static )
|
||||
static? ( ncurses )
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
|
||||
epatch "${FILESDIR}/${P}-Disable-Qt5-support-to-force-Qt4.patch"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
|
||||
|
||||
# Issues finding qt on multilib systems
|
||||
export QTLIB="${QTDIR}/$(get_libdir)"
|
||||
|
||||
econf \
|
||||
--enable-pinentry-tty \
|
||||
$(use_enable emacs pinentry-emacs) \
|
||||
$(use_enable gtk pinentry-gtk2) \
|
||||
$(use_enable ncurses pinentry-curses) \
|
||||
$(use_enable ncurses fallback-curses) \
|
||||
$(use_enable qt4 pinentry-qt) \
|
||||
$(use_with caps libcap) \
|
||||
$(use_enable gnome-keyring libsecret) \
|
||||
$(use_enable gnome-keyring pinentry-gnome3) \
|
||||
MOC="$(qt4_get_bindir)"/moc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
rm -f "${ED}"/usr/bin/pinentry || die
|
||||
|
||||
if use_enable qt4; then
|
||||
dosym pinentry-qt /usr/bin/pinentry-qt4
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
|
||||
elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
|
||||
elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
|
||||
elog "The soft resource limit for memory locking specifies the limit an"
|
||||
elog "unprivileged process may lock into memory. You can also use POSIX"
|
||||
elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
|
||||
elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
|
||||
elog "your users."
|
||||
fi
|
||||
|
||||
eselect pinentry update ifunset
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect pinentry update ifunset
|
||||
}
|
||||
@ -0,0 +1,261 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
# Description: fix warning: cast from pointer to integer of different size
|
||||
# Origin: https://sourceforge.net/tracker/download.php?group_id=11005&atid=311005&file_id=340993&aid=2846694
|
||||
# Bug: https://sourceforge.net/tracker/?func=detail&atid=311005&aid=2846694&group_id=11005
|
||||
# Author: Jack Howarth <jwhowarth@users.sourceforge.net>
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad nedit-5.6~cvs20081118~/Xlt/SlideC.c nedit-5.6~cvs20081118/Xlt/SlideC.c
|
||||
--- nedit-5.6~cvs20081118~/Xlt/SlideC.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/Xlt/SlideC.c 2009-09-15 22:05:42.000000000 +0200
|
||||
@@ -28,6 +28,7 @@
|
||||
#endif
|
||||
|
||||
#include <Xm/XmP.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
#include "SlideCP.h"
|
||||
|
||||
@@ -116,14 +117,14 @@
|
||||
/* notify that initialize called XtArgsProc */ NULL,
|
||||
/* NULL XtProc */ NULL,
|
||||
/* NULL XtPointer */ NULL,
|
||||
-/* NULL Cardinal */ (Cardinal)NULL,
|
||||
+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL,
|
||||
/* resources for subclass fields XtResourceList */ resources,
|
||||
/* number of entries in resources Cardinal */ XtNumber(resources),
|
||||
/* resource class quarkified XrmClass */ NULLQUARK,
|
||||
-/* NULL Boolean */ (Boolean)NULL,
|
||||
-/* NULL XtEnum */ (XtEnum)NULL,
|
||||
-/* NULL Boolean */ (Boolean)NULL,
|
||||
-/* NULL Boolean */ (Boolean)NULL,
|
||||
+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
|
||||
+/* NULL XtEnum */ (XtEnum)(uintptr_t)NULL,
|
||||
+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
|
||||
+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
|
||||
/* free data for subclass pointers XtWidgetProc */ destroy,
|
||||
/* NULL XtProc */ NULL,
|
||||
/* NULL XtProc */ NULL,
|
||||
diff -urNad nedit-5.6~cvs20081118~/source/file.c nedit-5.6~cvs20081118/source/file.c
|
||||
--- nedit-5.6~cvs20081118~/source/file.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/source/file.c 2009-09-15 22:06:42.000000000 +0200
|
||||
@@ -52,6 +52,7 @@
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -1914,7 +1915,7 @@
|
||||
if (XmToggleButtonGetState(w)) {
|
||||
XtPointer userData;
|
||||
XtVaGetValues(w, XmNuserData, &userData, NULL);
|
||||
- *(int*) clientData = (int) userData;
|
||||
+ *(int*) clientData = (int) (uintptr_t) userData;
|
||||
}
|
||||
}
|
||||
|
||||
diff -urNad nedit-5.6~cvs20081118~/source/highlight.c nedit-5.6~cvs20081118/source/highlight.c
|
||||
--- nedit-5.6~cvs20081118~/source/highlight.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/source/highlight.c 2009-09-15 22:07:06.000000000 +0200
|
||||
@@ -49,6 +49,7 @@
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
#ifdef VMS
|
||||
#include "../util/VMSparam.h"
|
||||
@@ -512,7 +513,7 @@
|
||||
if (!pattern) {
|
||||
return NULL;
|
||||
}
|
||||
- return (void*)pattern->userStyleIndex;
|
||||
+ return (void*)(uintptr_t)pattern->userStyleIndex;
|
||||
}
|
||||
|
||||
/*
|
||||
diff -urNad nedit-5.6~cvs20081118~/source/macro.c nedit-5.6~cvs20081118/source/macro.c
|
||||
--- nedit-5.6~cvs20081118~/source/macro.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/source/macro.c 2009-09-15 22:07:27.000000000 +0200
|
||||
@@ -60,6 +60,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
@@ -2924,7 +2925,7 @@
|
||||
readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
|
||||
btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
|
||||
XmNlabelString, s1=XmStringCreateSimple(btnLabel),
|
||||
- XmNuserData, (XtPointer)(i+1), NULL);
|
||||
+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
|
||||
XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
|
||||
XmStringFree(s1);
|
||||
}
|
||||
@@ -2965,7 +2966,7 @@
|
||||
return; /* shouldn't happen */
|
||||
if (XtClass(w) == xmPushButtonWidgetClass) {
|
||||
XtVaGetValues(w, XmNuserData, &userData, NULL);
|
||||
- retVal.val.n = (int)userData;
|
||||
+ retVal.val.n = (int)(uintptr_t)userData;
|
||||
} else
|
||||
retVal.val.n = 1;
|
||||
retVal.tag = INT_TAG;
|
||||
@@ -3101,7 +3102,7 @@
|
||||
readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
|
||||
btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
|
||||
XmNlabelString, s1=XmStringCreateSimple(btnLabel),
|
||||
- XmNuserData, (XtPointer)(i+1), NULL);
|
||||
+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
|
||||
XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
|
||||
XmStringFree(s1);
|
||||
}
|
||||
@@ -3155,7 +3156,7 @@
|
||||
returned in w. */
|
||||
if (XtClass(w) == xmPushButtonWidgetClass) {
|
||||
XtVaGetValues(w, XmNuserData, &userData, NULL);
|
||||
- btnNum = (int)userData;
|
||||
+ btnNum = (int)(uintptr_t)userData;
|
||||
} else
|
||||
btnNum = 1;
|
||||
|
||||
@@ -3680,7 +3681,7 @@
|
||||
readStringArg(argList[i], &btnLabel, btnStorage, errMsg);
|
||||
btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
|
||||
XmNlabelString, s1=XmStringCreateSimple(btnLabel),
|
||||
- XmNuserData, (XtPointer)(i+1), NULL);
|
||||
+ XmNuserData, (XtPointer)(uintptr_t)(i+1), NULL);
|
||||
XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
|
||||
XmStringFree(s1);
|
||||
}
|
||||
@@ -3760,7 +3761,7 @@
|
||||
returned in w. */
|
||||
if (XtClass(w) == xmPushButtonWidgetClass) {
|
||||
XtVaGetValues(w, XmNuserData, &userData, NULL);
|
||||
- btnNum = (int)userData;
|
||||
+ btnNum = (int)(uintptr_t)userData;
|
||||
} else
|
||||
btnNum = 1;
|
||||
|
||||
diff -urNad nedit-5.6~cvs20081118~/source/preferences.c nedit-5.6~cvs20081118/source/preferences.c
|
||||
--- nedit-5.6~cvs20081118~/source/preferences.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/source/preferences.c 2009-09-15 22:07:47.000000000 +0200
|
||||
@@ -58,6 +58,7 @@
|
||||
#include <ctype.h>
|
||||
#include <pwd.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
@@ -2296,7 +2297,7 @@
|
||||
XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
|
||||
for (n=0; n<(int)nItems; n++) {
|
||||
XtVaGetValues(items[n], XmNuserData, &userData, NULL);
|
||||
- XmToggleButtonSetState(items[n], (int)userData == mode, False);
|
||||
+ XmToggleButtonSetState(items[n], (int)(uintptr_t)userData == mode, False);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5148,7 +5149,7 @@
|
||||
xmToggleButtonGadgetClass, menu,
|
||||
XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
|
||||
XmNmarginHeight, 0,
|
||||
- XmNuserData, (void *)i,
|
||||
+ XmNuserData, (void *)(uintptr_t)i,
|
||||
XmNset, window->languageMode==i, NULL);
|
||||
XmStringFree(s1);
|
||||
XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
|
||||
@@ -5169,14 +5170,14 @@
|
||||
XtVaGetValues(w, XmNuserData, &mode, NULL);
|
||||
|
||||
/* If the mode didn't change, do nothing */
|
||||
- if (window->languageMode == (int)mode)
|
||||
+ if (window->languageMode == (int)(uintptr_t)mode)
|
||||
return;
|
||||
|
||||
/* redo syntax highlighting word delimiters, etc. */
|
||||
/*
|
||||
reapplyLanguageMode(window, (int)mode, False);
|
||||
*/
|
||||
- params[0] = (((int)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)mode]->name;
|
||||
+ params[0] = (((int)(uintptr_t)mode) == PLAIN_LANGUAGE_MODE) ? "" : LanguageModes[(int)(uintptr_t)mode]->name;
|
||||
XtCallActionProc(window->textArea, "set_language_mode", NULL, params, 1);
|
||||
}
|
||||
|
||||
diff -urNad nedit-5.6~cvs20081118~/source/regularExp.c nedit-5.6~cvs20081118/source/regularExp.c
|
||||
--- nedit-5.6~cvs20081118~/source/regularExp.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/source/regularExp.c 2009-09-15 22:08:16.000000000 +0200
|
||||
@@ -88,6 +88,7 @@
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef HAVE_DEBUG_H
|
||||
@@ -4157,7 +4158,7 @@
|
||||
table [*c] = 1;
|
||||
}
|
||||
|
||||
- table [(int) NULL] = 1; /* These */
|
||||
+ table [(int)(uintptr_t) NULL] = 1; /* These */
|
||||
table [(int) '\t'] = 1; /* characters */
|
||||
table [(int) '\n'] = 1; /* are always */
|
||||
table [(int) ' ' ] = 1; /* delimiters. */
|
||||
diff -urNad nedit-5.6~cvs20081118~/source/userCmds.c nedit-5.6~cvs20081118/source/userCmds.c
|
||||
--- nedit-5.6~cvs20081118~/source/userCmds.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/source/userCmds.c 2009-09-15 22:08:47.000000000 +0200
|
||||
@@ -49,6 +49,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#ifdef VMS
|
||||
@@ -1116,7 +1117,7 @@
|
||||
XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
|
||||
dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
|
||||
} else {
|
||||
- index = (int)userData - 10;
|
||||
+ index = (int)(uintptr_t)userData - 10;
|
||||
if (index <0 || index >= nMenuItems)
|
||||
return;
|
||||
if (menuList[index]->input == FROM_SELECTION)
|
||||
@@ -1928,7 +1929,7 @@
|
||||
XmNlabelString, st1,
|
||||
XmNacceleratorText, st2,
|
||||
XmNmnemonic, f->mnemonic,
|
||||
- XmNuserData, (XtPointer)(index+10), NULL);
|
||||
+ XmNuserData, (XtPointer)(uintptr_t)(index+10), NULL);
|
||||
XtAddCallback(btn, XmNactivateCallback, cbRtn, cbArg);
|
||||
XmStringFree(st1);
|
||||
XmStringFree(st2);
|
||||
diff -urNad nedit-5.6~cvs20081118~/util/prefFile.c nedit-5.6~cvs20081118/util/prefFile.c
|
||||
--- nedit-5.6~cvs20081118~/util/prefFile.c 2009-09-15 21:27:12.000000000 +0200
|
||||
+++ nedit-5.6~cvs20081118/util/prefFile.c 2009-09-15 22:04:14.000000000 +0200
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
+#include <stdint.h>
|
||||
#ifdef VMS
|
||||
#include "VMSparam.h"
|
||||
#else
|
||||
@@ -353,9 +354,9 @@
|
||||
*(int *)rsrcDescrip->valueAddr = 0;
|
||||
return False;
|
||||
case PREF_STRING:
|
||||
- if ((int)strlen(string) >= (int)rsrcDescrip->arg)
|
||||
+ if ((int)strlen(string) >= (int)(uintptr_t)rsrcDescrip->arg)
|
||||
return False;
|
||||
- strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
|
||||
+ strncpy(rsrcDescrip->valueAddr, string, (int)(uintptr_t)rsrcDescrip->arg);
|
||||
return True;
|
||||
case PREF_ALLOC_STRING:
|
||||
*(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);
|
||||
@ -0,0 +1,17 @@
|
||||
--- source/Makefile.common 2004-03-21 15:25:56.000000000 +0100
|
||||
+++ source/Makefile.common.new 2009-10-24 10:47:03.667835157 +0200
|
||||
@@ -21,12 +21,12 @@
|
||||
# we only want natural rebuilds to regenerate the link date.
|
||||
nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
|
||||
$(CC) $(CFLAGS) -c linkdate.c
|
||||
- $(CC) $(CFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) linkdate.o $(XMLLIB) \
|
||||
$(XLTLIB) ../util/libNUtil.a $(LIBS) -o $@
|
||||
|
||||
# Note LIBS isn't quite right here; it links unnecessarily against Motif
|
||||
nc: nc.o server_common.o ../util/libNUtil.a
|
||||
- $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
|
||||
|
||||
help.o: help.c
|
||||
$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
|
||||
@ -0,0 +1,74 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Multi-purpose text editor for the X Window System"
|
||||
HOMEPAGE="http://sourceforge.net/projects/nedit"
|
||||
SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
|
||||
RDEPEND=">=x11-libs/motif-2.3:0
|
||||
x11-libs/libXp
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXt
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}
|
||||
|| ( dev-util/yacc sys-devel/bison )
|
||||
dev-lang/perl"
|
||||
|
||||
S="${WORKDIR}/${PN}-5.6"
|
||||
|
||||
src_prepare() {
|
||||
#respecting LDFLAGS, bug #208189
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-ldflags.patch \
|
||||
"${FILESDIR}"/${P}-40_Pointer_to_Integer.patch
|
||||
sed \
|
||||
-e "s:bin/:${EPREFIX}/bin/:g" \
|
||||
-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
|
||||
sed \
|
||||
-e "s:nc:neditc:g" -i doc/nc.pod || die
|
||||
sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
|
||||
makefiles/Makefile.linux || die
|
||||
sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \
|
||||
-e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
|
||||
-e "s:-lX11:-lX11 -lXmu -liconv:" \
|
||||
-e "s:check_tif_rule::" \
|
||||
makefiles/Makefile.macosx || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
case "${CHOST}" in
|
||||
*-darwin*)
|
||||
emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
|
||||
;;
|
||||
*-linux*)
|
||||
emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
|
||||
;;
|
||||
esac
|
||||
emake VERSION="NEdit ${PV}" -C doc all
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin source/nedit
|
||||
newbin source/nc neditc
|
||||
|
||||
make_desktop_entry "${PN}"
|
||||
doicon "${FILESDIR}/${PN}.svg"
|
||||
|
||||
newman doc/nedit.man nedit.1
|
||||
newman doc/nc.man neditc.1
|
||||
|
||||
dodoc README ReleaseNotes ChangeLog
|
||||
dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
|
||||
dohtml doc/nedit.html
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
AUX bomberclone-0.11.8-gcc52.patch 223 SHA256 01cce9ecad27c81f1d8962c0b68a0aaa4cfcd25128b87077abe64b687206ca0f SHA512 d083f65074b1b8a582d62986b363df8db3bc75cd0fb0d8e02ace95db3a168fe985091ba9673bdf3b20422426285985941dd747d3b4ce590776969170d5d69c20 WHIRLPOOL d857c82840f75e0e63ea6ed0c2a2d31cc22df220ef942f8cb5d3be4c317b3aeb8df2de89ee262ad8737d66cc4502ccf51cb3af87d37c68f35b2a7ebb5eab56ac
|
||||
AUX bomberclone-0.11.8-underlink.patch 434 SHA256 beb97c076006e788450c71c41639a934084445b4b2f514e62f157195d88e1e1c SHA512 5071ea08f7c5ee3b3906f85b09532e27b20076654916041f54db426e0080495d73e4080356b6d60fe7d9b11354197cb0a7ed7c0106668968bd6b69fffebdb64f WHIRLPOOL 037da5a87887db59ed57b6ca30d0b7a132d975ee1a2c60ee93715b44faad059aff7e506c0a71d52b974f1e38af6e6d165cd1e61b6f21c2c0f3e0ef62561ca825
|
||||
DIST bomberclone-0.11.8.tar.bz2 7966452 SHA256 2f6993ee4a63e8cea51f9605e35de4b4ec12a5abafd25309c313ddb0fba35230 SHA512 a5e52db43f7f508993231ec13bb2705f60e25cfc21d15c17d9b422c6fc948dc14cc8c4519acfac2e9b7b32a3072dc3a521fbf28b2150a86cfb4099ced72ab79b WHIRLPOOL 89ecc1ce9f18342ea0bf4cb099e26eed8dc2ebddf71c75356f522a0a2b5d593d1525234c104d441f4d3073efb01e78fe234b0a7aabb81baa236df6c5133084c4
|
||||
EBUILD bomberclone-0.11.8.ebuild 1093 SHA256 df75a92780f94b3644c2726976ba2b8fa0fd211644cc791b9858015da7abecdf SHA512 6286d0d60eeb6c018726cd9cdd51543db69017a455613329a5cd8cb0278bc338b8c96e65f2c7fe518eecdc597ea55af840228e5cb2f9dc98616d8129c7203165 WHIRLPOOL 379f537c2f245e9a47da9cb04e2173110d837f865e04ed2fb141cbaacf1d6385053f174e54909a454e379775f8e3d60837d934015524038c725a0b4623dd2c15
|
||||
EBUILD bomberclone-0.11.8.ebuild 1128 SHA256 dbd26f18267189b676483b7592a378028ad2c9c111449cf8ced72f39e1d54261 SHA512 8081ff327547fdb503b9b1191ff3282e1db55b9f3058eb6f8a1fbfab9bc564fd6f3f473558b8cb122903a12cded8ba4b77123e5ed2ebe92df932b1d1d02d3698 WHIRLPOOL cb0d3a5d0033e366067a4d41c8c3ffdd4a2b573bd6872851aae32ca579ef87fa34bd0dbf2abdb04e9fc8edb64d92da13c321488876d012cab44d9f7eee959fdf
|
||||
MISC ChangeLog 4573 SHA256 8e94c6369cc9ad25dba0608fce403b3fea9ad7b9e4a19651d84f6a0826106cdd SHA512 f93c070e87074a540434aec650db206680c764cc0a045cda5328594618be4a221938cb19811fbb5edf88669fa7b19eef1ec9a9d89638062d9ccd31b71c7b5dfd WHIRLPOOL 0d3bca2d7698572264afe52b88c5fdf8b4f8cf5d2468516928e0abbccb78fb3bed21cc93a8479cbac5a84b01fac5cc1dd709a6c5bbd8947d27792e29599d99dd
|
||||
MISC metadata.xml 240 SHA256 0ad4a3839c783a9947bbfd32ef065892da34745e1189f837bb2009b88e718e20 SHA512 596aee312503c0a1609f9d19f75f0303c2bf6541f82bfeecbb4d8d6abac11378ed171f5259b0cd1546b615b25055fc060738878be6ea578da1b465274c66ae71 WHIRLPOOL e60ec704f63c77846125d17a234b680b7bfa071b0ab7c790732765aa76ad5503fbcfe1fe80eb94942d67ed7cdfe2ece3e85b7f00be49d982114f5566c8b6c753
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- src/single.c.old 2015-09-17 09:21:57.826930680 +0200
|
||||
+++ src/single.c 2015-09-17 09:22:04.315824372 +0200
|
||||
@@ -476,7 +476,7 @@
|
||||
};
|
||||
|
||||
|
||||
-inline int
|
||||
+static inline int
|
||||
ai_checknewpos (_point pos, int d)
|
||||
{
|
||||
_point m;
|
||||
@ -1 +1 @@
|
||||
Fri, 18 Sep 2015 12:11:15 +0000
|
||||
Fri, 18 Sep 2015 17:41:13 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Fri, 18 Sep 2015 12:11:16 +0000
|
||||
Fri, 18 Sep 2015 17:41:13 +0000
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=configure install postinst postrm prepare
|
||||
DEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig gnome-keyring? ( app-crypt/libsecret ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol
|
||||
EAPI=5
|
||||
HOMEPAGE=http://gnupg.org/aegypten2/index.html
|
||||
IUSE=emacs gtk ncurses qt4 caps gnome-keyring static
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2 app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
|
||||
REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.6.tar.bz2
|
||||
_eclasses_=autotools 7d16e72a943b4803ca9691b2ecf89216 eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 qmake-utils 05b63bb5c708c5903a9de5c58c8e43c8 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
|
||||
_md5_=f9db76b810834756bd88ad79e5485cc4
|
||||
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
|
||||
DEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/xerces-c[icu] dev-python/matplotlib dev-python/pyside[X] dev-python/shiboken dev-qt/designer:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 media-libs/coin || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 ) sys-libs/zlib virtual/glu >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pyside-tools >=dev-lang/swig-2.0.4-r1:0 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1 virtual/fortran
|
||||
DEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/xerces-c[icu] dev-python/matplotlib dev-python/pyside[X,svg] dev-python/shiboken dev-qt/designer:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 media-libs/coin || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 ) sys-libs/zlib virtual/glu >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pyside-tools >=dev-lang/swig-2.0.4-r1:0 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1 virtual/fortran
|
||||
DESCRIPTION=QT based Computer Aided Design application
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.freecadweb.org/
|
||||
IUSE=python_targets_python2_7
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/xerces-c[icu] dev-python/matplotlib dev-python/pyside[X] dev-python/shiboken dev-qt/designer:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 media-libs/coin || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 ) sys-libs/zlib virtual/glu >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-qt/assistant:4 dev-python/pivy dev-python/numpy virtual/fortran
|
||||
RDEPEND=dev-cpp/eigen:3 dev-libs/boost dev-libs/xerces-c[icu] dev-python/matplotlib dev-python/pyside[X,svg] dev-python/shiboken dev-qt/designer:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 media-libs/coin || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 ) sys-libs/zlib virtual/glu >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-qt/assistant:4 dev-python/pivy dev-python/numpy virtual/fortran
|
||||
RESTRICT=bindist mirror
|
||||
SLOT=0
|
||||
_eclasses_=cmake-utils f474224ef49d530640a43a04ae94928e eutils 351a78113be5b393c09a2c948701ad36 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic 85dc1eac3c64d8141374490ed64122e5 fortran-2 eb14fa8f4c3b9977b8d26c2c653ca325 git-r3 1502b9838d043db47700b8120083e637 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 python-single-r1 612c783d1a1a182ad7ea4f2eb0b79e86 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
|
||||
_md5_=faa83b08f0be1eaee374f797fc55155d
|
||||
_md5_=9434f6b9296871c4ad4bb8c31d547649
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
|
||||
DEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.6 ) perl? ( >=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4 ) python? ( >=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0 )
|
||||
DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.gdal.org/
|
||||
IUSE=armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 elibc_FreeBSD java
|
||||
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
|
||||
LICENSE=MIT
|
||||
RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.2.0 )
|
||||
REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
|
||||
SLOT=0
|
||||
SRC_URI=http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
|
||||
_eclasses_=autotools 7d16e72a943b4803ca9691b2ecf89216 distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 351a78113be5b393c09a2c948701ad36 java-pkg-opt-2 4a567b4a22dd2dc61b77c056d29353a5 java-utils-2 c7374d201551e4fb8552994ef210e0f7 libtool 7f78cd7d403808a350c9ae23f5821fb4 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde perl-module 1cfb38bf68a24c8394e41d2f53003146 python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361 unpacker 1ca344bd9b922a7f8084a3fa02933b79 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=5a0b13a884a21a1887b780a049130cc0
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=media-libs/opencv:= sci-libs/pcl[openni] sci-libs/vtk sys-libs/zlib openni2? ( dev-libs/OpenNI2 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
|
||||
EAPI=5
|
||||
HOMEPAGE=http://introlab.github.io/rtabmap/
|
||||
IUSE=qt4 openni2
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=media-libs/opencv:= sci-libs/pcl[openni] sci-libs/vtk sys-libs/zlib openni2? ( dev-libs/OpenNI2 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/introlab/rtabmap/archive/0.8.2.tar.gz -> rtabmap-0.8.2.tar.gz
|
||||
_eclasses_=cmake-utils f474224ef49d530640a43a04ae94928e eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
|
||||
_md5_=f8a121a2ca921cc05b50efcca02d02d1
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=media-libs/opencv:= sci-libs/pcl[openni] sci-libs/vtk sys-libs/zlib openni2? ( dev-libs/OpenNI2 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
|
||||
EAPI=5
|
||||
HOMEPAGE=http://introlab.github.io/rtabmap/
|
||||
IUSE=qt4 openni2
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=media-libs/opencv:= sci-libs/pcl[openni] sci-libs/vtk sys-libs/zlib openni2? ( dev-libs/OpenNI2 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/introlab/rtabmap/archive/0.8.3.tar.gz -> rtabmap-0.8.3.tar.gz
|
||||
_eclasses_=cmake-utils f474224ef49d530640a43a04ae94928e eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
|
||||
_md5_=f8a121a2ca921cc05b50efcca02d02d1
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=media-libs/opencv:= sci-libs/pcl[openni] sci-libs/vtk sys-libs/zlib ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) !qt5? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4 ) ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
|
||||
DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
|
||||
EAPI=5
|
||||
HOMEPAGE=http://introlab.github.io/rtabmap/
|
||||
IUSE=ieee1394 openni2 qt4 qt5
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=BSD
|
||||
RDEPEND=media-libs/opencv:= sci-libs/pcl[openni] sci-libs/vtk sys-libs/zlib ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) !qt5? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtcore:4 ) ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/introlab/rtabmap/archive/0.9.0.tar.gz -> rtabmap-0.9.0.tar.gz
|
||||
_eclasses_=cmake-utils f474224ef49d530640a43a04ae94928e eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
|
||||
_md5_=66bb149a491b0491bb14791381e70bec
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
|
||||
DEPEND==sys-kernel/spl-0.6.5* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
|
||||
EAPI=4
|
||||
HOMEPAGE=http://zfsonlinux.org/
|
||||
IUSE=custom-cflags debug +rootfs kernel_linux
|
||||
KEYWORDS=~amd64 ~arm ~ppc ~ppc64
|
||||
LICENSE=CDDL debug? ( GPL-2+ )
|
||||
RDEPEND==sys-kernel/spl-0.6.5* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
|
||||
RESTRICT=debug? ( strip ) test
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.5.tar.gz
|
||||
_eclasses_=autotools 7d16e72a943b4803ca9691b2ecf89216 autotools-utils 0bf099a6e3dfeaf20a7a94504d8dd896 eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 libtool 7f78cd7d403808a350c9ae23f5821fb4 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a linux-mod 9e27971daa324852d78bc7d4d811afae multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=8ee736c6b3d06d7a152b9726ed745433
|
||||
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare test unpack
|
||||
DEPEND=>=dev-vcs/git-1.8.2.1 python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
|
||||
DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1 python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
|
||||
DESCRIPTION=Command line interface to (Gentoo) Bugzilla
|
||||
EAPI=5
|
||||
HOMEPAGE=https://www.github.com/williamh/pybugz
|
||||
IUSE=zsh-completion python_targets_python3_3 python_targets_python3_4
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
|
||||
RDEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
|
||||
REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
|
||||
SLOT=0
|
||||
_eclasses_=bash-completion-r1 b1fc4d30333bb528c8abb4332bb70ea6 distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 351a78113be5b393c09a2c948701ad36 git-r3 1502b9838d043db47700b8120083e637 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
|
||||
_md5_=030e3b457e705b022ea9c9013ca0e1b4
|
||||
_md5_=599edcc5e0097711a29cf2a16375f4fd
|
||||
|
||||
@ -1 +1 @@
|
||||
Fri, 18 Sep 2015 12:11:16 +0000
|
||||
Fri, 18 Sep 2015 17:41:13 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Fri Sep 18 12:11:15 UTC 2015
|
||||
Fri Sep 18 17:41:13 UTC 2015
|
||||
|
||||
@ -1 +1 @@
|
||||
Fri, 18 Sep 2015 12:30:01 +0000
|
||||
Fri, 18 Sep 2015 18:00:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
1442578201 Fri 18 Sep 2015 12:10:01 PM UTC
|
||||
1442598001 Fri 18 Sep 2015 05:40:01 PM UTC
|
||||
|
||||
@ -0,0 +1,185 @@
|
||||
X-Gentoo-Bug: 550252
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=550252
|
||||
Upstream report: https://github.com/arvidn/libtorrent/issues/157
|
||||
[markos]: Merge commits
|
||||
Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
|
||||
|
||||
From 61a896035782436d5a8cceef1fc997e97ebbe019 Mon Sep 17 00:00:00 2001
|
||||
From: arvidn <arvid@libtorrent.org>
|
||||
Date: Sat, 12 Sep 2015 09:54:40 -0400
|
||||
Subject: [PATCH] remove parse_hash_fails.cpp
|
||||
|
||||
From 21e908ed1ea661c41e836230b8cf066688038d2b Mon Sep 17 00:00:00 2001
|
||||
From: arvidn <arvid@libtorrent.org>
|
||||
Date: Sat, 12 Sep 2015 09:56:30 -0400
|
||||
Subject: [PATCH] remove parse_hash_fails from Jamfile also
|
||||
---
|
||||
tools/Makefile.am | 2 -
|
||||
tools/parse_hash_fails.cpp | 104 --------------------------------------------
|
||||
tools/parse_request_log.cpp | 5 ++-
|
||||
tools/Jamfile | 1 -
|
||||
4 files changed, 5 insertions(+), 108 deletions(-)
|
||||
delete mode 100644 tools/parse_hash_fails.cpp
|
||||
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 0e41abd..4d90a78 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -1,5 +1,4 @@
|
||||
tool_programs = \
|
||||
- parse_hash_fails \
|
||||
parse_request_log
|
||||
|
||||
if ENABLE_EXAMPLES
|
||||
@@ -25,7 +24,6 @@ EXTRA_DIST = Jamfile \
|
||||
run_regression_tests.py\
|
||||
run_tests.py
|
||||
|
||||
-parse_hash_fails_SOURCES = parse_hash_fails.cpp
|
||||
parse_request_log_SOURCES = parse_request_log.cpp
|
||||
|
||||
LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
|
||||
diff --git a/tools/parse_hash_fails.cpp b/tools/parse_hash_fails.cpp
|
||||
deleted file mode 100644
|
||||
index f686c5e..0000000
|
||||
--- a/tools/parse_hash_fails.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,104 +0,0 @@
|
||||
-/*
|
||||
-
|
||||
-Copyright (c) 2012, Arvid Norberg
|
||||
-All rights reserved.
|
||||
-
|
||||
-Redistribution and use in source and binary forms, with or without
|
||||
-modification, are permitted provided that the following conditions
|
||||
-are met:
|
||||
-
|
||||
- * Redistributions of source code must retain the above copyright
|
||||
- notice, this list of conditions and the following disclaimer.
|
||||
- * Redistributions in binary form must reproduce the above copyright
|
||||
- notice, this list of conditions and the following disclaimer in
|
||||
- the documentation and/or other materials provided with the distribution.
|
||||
- * Neither the name of the author nor the names of its
|
||||
- contributors may be used to endorse or promote products derived
|
||||
- from this software without specific prior written permission.
|
||||
-
|
||||
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
-POSSIBILITY OF SUCH DAMAGE.
|
||||
-
|
||||
-*/
|
||||
-
|
||||
-#include <stdlib.h>
|
||||
-#include <string>
|
||||
-#include <cstring>
|
||||
-#include "libtorrent/file.hpp"
|
||||
-
|
||||
-using namespace libtorrent;
|
||||
-
|
||||
-void print_usage()
|
||||
-{
|
||||
- fprintf(stderr, "usage: parse_hash_fails log-directory\n");
|
||||
- exit(1);
|
||||
-}
|
||||
-
|
||||
-int main(int argc, char* argv[])
|
||||
-{
|
||||
- if (argc != 2) print_usage();
|
||||
-
|
||||
- error_code ec;
|
||||
- directory d(argv[1], ec);
|
||||
- if (ec)
|
||||
- {
|
||||
- fprintf(stderr, "failed to open directory: %s\n%s\n"
|
||||
- , argv[1], ec.message().c_str());
|
||||
- return 1;
|
||||
- }
|
||||
-
|
||||
- for (; !d.done(); d.next(ec))
|
||||
- {
|
||||
- if (ec)
|
||||
- {
|
||||
- fprintf(stderr, "error listing directory: %s\n", ec.message().c_str());
|
||||
- return 1;
|
||||
- }
|
||||
- std::string filename = d.file();
|
||||
- char hash[41];
|
||||
- int piece;
|
||||
- int block;
|
||||
- char state[10]; // good, bad
|
||||
- if (sscanf(filename.c_str(), "%40s_%d_%d_%4s.block", hash, &piece, &block, state) != 4)
|
||||
- {
|
||||
- fprintf(stderr, "no match: %s\n", filename.c_str());
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- if (strcmp(state, "good") != 0) continue;
|
||||
-
|
||||
- char target_filename[1024];
|
||||
- snprintf(target_filename, sizeof(target_filename), "%s_%d_%d.diff", hash, piece, block);
|
||||
-
|
||||
- fprintf(stderr, "diffing %s\n", filename.c_str());
|
||||
- char cmdline[2048];
|
||||
- snprintf(cmdline, sizeof(cmdline), "xxd %s >temp_good", combine_path(argv[1], filename).c_str());
|
||||
- system(cmdline);
|
||||
- snprintf(cmdline, sizeof(cmdline), "xxd %s/%s_%d_%d_bad.block >temp_bad", argv[1], hash, piece, block);
|
||||
- system(cmdline);
|
||||
- snprintf(cmdline, sizeof(cmdline), "diff -y temp_good temp_bad | colordiff >%s"
|
||||
- , combine_path(argv[1], target_filename).c_str());
|
||||
- system(cmdline);
|
||||
- }
|
||||
-
|
||||
- FILE* log_file = fopen(argv[1], "r");
|
||||
- if (log_file == 0)
|
||||
- {
|
||||
- fprintf(stderr, "failed to open logfile: %s\n%d: %s\n"
|
||||
- , argv[1], errno, strerror(errno));
|
||||
- return 1;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-
|
||||
diff --git a/tools/parse_request_log.cpp b/tools/parse_request_log.cpp
|
||||
index c719f65..8394918 100644
|
||||
--- a/tools/parse_request_log.cpp
|
||||
+++ b/tools/parse_request_log.cpp
|
||||
@@ -30,13 +30,16 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
*/
|
||||
|
||||
-#include "libtorrent/file.hpp"
|
||||
+#include "libtorrent/config.hpp"
|
||||
#include "libtorrent/io.hpp"
|
||||
#include <cstring>
|
||||
#include <boost/bind.hpp>
|
||||
#include <stdlib.h>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
+#include <assert.h>
|
||||
+#include <stdio.h>
|
||||
+#include <errno.h>
|
||||
|
||||
using namespace libtorrent;
|
||||
using namespace libtorrent::detail; // for write_* and read_*
|
||||
diff --git a/tools/Jamfile b/tools/Jamfile
|
||||
index 69ee424..0c156d0 100644
|
||||
--- a/tools/Jamfile
|
||||
+++ b/tools/Jamfile
|
||||
@@ -33,7 +33,6 @@ project tools
|
||||
<link>static
|
||||
;
|
||||
|
||||
-exe parse_hash_fails : parse_hash_fails.cpp ;
|
||||
exe parse_request_log : parse_request_log.cpp ;
|
||||
exe dht : dht_put.cpp : <include>../ed25519/src ;
|
||||
|
||||
@ -0,0 +1,316 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
WANT_AUTOCONF="2.5"
|
||||
|
||||
GENTOO_DEPEND_ON_PERL="no"
|
||||
PYTHON_COMPAT=( python2_7 python3_{3,4} )
|
||||
DISTUTILS_OPTIONAL=1
|
||||
|
||||
inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
|
||||
|
||||
DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
|
||||
HOMEPAGE="http://www.gdal.org/"
|
||||
SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="MIT"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/expat
|
||||
dev-libs/json-c
|
||||
dev-libs/libpcre
|
||||
dev-libs/libxml2
|
||||
media-libs/tiff:0=
|
||||
sci-libs/libgeotiff
|
||||
sys-libs/zlib[minizip(+)]
|
||||
armadillo? ( sci-libs/armadillo[lapack] )
|
||||
curl? ( net-misc/curl )
|
||||
fits? ( sci-libs/cfitsio )
|
||||
geos? ( >=sci-libs/geos-2.2.1 )
|
||||
gif? ( media-libs/giflib )
|
||||
gml? ( >=dev-libs/xerces-c-3 )
|
||||
hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
|
||||
java? ( >=virtual/jre-1.6:* )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
jpeg2k? ( media-libs/jasper )
|
||||
mysql? ( virtual/mysql )
|
||||
netcdf? ( sci-libs/netcdf )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
ogdi? ( sci-libs/ogdi )
|
||||
opencl? ( virtual/opencl )
|
||||
pdf? ( >=app-text/poppler-0.24.3:= )
|
||||
perl? ( dev-lang/perl:= )
|
||||
png? ( media-libs/libpng:0= )
|
||||
postgres? ( >=dev-db/postgresql-8.4:= )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
)
|
||||
sqlite? ( dev-db/sqlite:3 )
|
||||
spatialite? ( dev-db/spatialite )
|
||||
xls? ( dev-libs/freexl )
|
||||
"
|
||||
|
||||
SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen )
|
||||
java? ( >=virtual/jdk-1.6 )
|
||||
perl? ( ${SWIG_DEP} )
|
||||
python? ( ${SWIG_DEP} )"
|
||||
|
||||
AT_M4DIR="${S}/m4"
|
||||
MAKEOPTS+=" -j1"
|
||||
|
||||
REQUIRED_USE="
|
||||
spatialite? ( sqlite )
|
||||
mdb? ( java )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
java-pkg-opt-2_src_prepare
|
||||
|
||||
# fix datadir and docdir placement
|
||||
sed -i \
|
||||
-e "s:@datadir@:@datadir@/gdal:" \
|
||||
-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
|
||||
"${S}"/GDALmake.opt.in || die
|
||||
|
||||
# the second sed expression should fix bug 371075
|
||||
sed -i \
|
||||
-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
|
||||
-e "s:--prefix=\$(DESTDIR):--prefix=:" \
|
||||
"${S}"/swig/python/GNUmakefile || die
|
||||
|
||||
# -soname is only accepted by GNU ld/ELF
|
||||
[[ ${CHOST} == *-darwin* ]] \
|
||||
&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
|
||||
|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
|
||||
|
||||
# Fix spatialite/sqlite include issue
|
||||
sed -i \
|
||||
-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
|
||||
ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
|
||||
|
||||
# Fix freexl configure check
|
||||
sed -i \
|
||||
-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
|
||||
configure.in || die
|
||||
|
||||
sed \
|
||||
-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
|
||||
-i configure.in || die
|
||||
|
||||
sed \
|
||||
-e 's:^ar:$(AR):g' \
|
||||
-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
|
||||
|
||||
tc-export AR RANLIB
|
||||
|
||||
eautoreconf
|
||||
|
||||
prepare_python() {
|
||||
mkdir -p "${BUILD_DIR}" || die
|
||||
find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
|
||||
find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
|
||||
# mkdir -p "${BUILD_DIR}"/swig/python || die
|
||||
# mkdir -p "${BUILD_DIR}"/apps || die
|
||||
# cp -dpR --target="${BUILD_DIR}"/swig/ \
|
||||
# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
|
||||
# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
|
||||
# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
|
||||
# ln -s "${S}"/port "${BUILD_DIR}"/ || die
|
||||
}
|
||||
if use python; then
|
||||
python_foreach_impl prepare_python
|
||||
fi
|
||||
}
|
||||
|
||||
gdal_src_configure() {
|
||||
local myopts=""
|
||||
|
||||
if use java; then
|
||||
myopts+="
|
||||
--with-java=$(java-config --jdk-home 2>/dev/null)
|
||||
$(use_with mdb)"
|
||||
else
|
||||
myopts+=" --without-java --without-mdb"
|
||||
use mdb && ewarn "mdb requires java use enabled. disabling"
|
||||
fi
|
||||
|
||||
if use sqlite; then
|
||||
myopts+=" LIBS=-lsqlite3"
|
||||
fi
|
||||
|
||||
# pcidsk is internal, because there is no such library yet released
|
||||
# also that thing is developed by the gdal people
|
||||
# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
|
||||
# bsb - legal issues
|
||||
# oracle - disabled, i dont have and can't test
|
||||
# ingres - same story as oracle oci
|
||||
# podofo - we use poppler instead they are exclusive for each other
|
||||
# tiff is a hard dep
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--includedir="${EPREFIX}/usr/include/${PN}" \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--with-expat \
|
||||
--with-geotiff \
|
||||
--with-grib \
|
||||
--with-libtiff \
|
||||
--with-libz="${EPREFIX}/usr/" \
|
||||
--with-ogr \
|
||||
--without-bsb \
|
||||
--without-dods-root \
|
||||
--without-dwgdirect \
|
||||
--without-epsilon \
|
||||
--without-fme \
|
||||
--without-grass \
|
||||
--without-hdf4 \
|
||||
--without-idb \
|
||||
--without-ingres \
|
||||
--without-jp2mrsid \
|
||||
--without-kakadu \
|
||||
--without-libtool \
|
||||
--without-mrsid \
|
||||
--without-msg \
|
||||
--without-oci \
|
||||
--without-pcraster \
|
||||
--without-podofo \
|
||||
--without-sde \
|
||||
$(use_enable debug) \
|
||||
$(use_with armadillo) \
|
||||
$(use_with aux_xml pam) \
|
||||
$(use_with curl) \
|
||||
--without-ecw \
|
||||
$(use_with fits cfitsio) \
|
||||
$(use_with geos) \
|
||||
$(use_with gif) \
|
||||
$(use_with gml xerces) \
|
||||
$(use_with hdf5) \
|
||||
$(use_with jpeg pcidsk) \
|
||||
$(use_with jpeg) \
|
||||
$(use_with jpeg2k jasper) \
|
||||
$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
|
||||
$(use_with netcdf) \
|
||||
$(use_with odbc) \
|
||||
$(use_with ogdi ogdi "${EPREFIX}"/usr) \
|
||||
$(use_with opencl) \
|
||||
$(use_with pdf poppler) \
|
||||
$(use_with perl) \
|
||||
$(use_with png) \
|
||||
$(use_with postgres pg) \
|
||||
$(use_with python) \
|
||||
$(use_with spatialite) \
|
||||
$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
|
||||
$(use_with threads) \
|
||||
$(use_with xls freexl) \
|
||||
${myopts}
|
||||
|
||||
# mysql-config puts this in (and boy is it a PITA to get it out)
|
||||
if use mysql; then
|
||||
sed -i \
|
||||
-e "s: -rdynamic : :" \
|
||||
GDALmake.opt || die "sed LIBS failed"
|
||||
fi
|
||||
|
||||
if [[ -n $use_python ]]; then
|
||||
# updated for newer swig (must specify the path to input files)
|
||||
sed -i \
|
||||
-e "s: gdal_array.i: ../include/gdal_array.i:" \
|
||||
-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
|
||||
swig/python/GNUmakefile || die "sed python makefile failed"
|
||||
sed -i \
|
||||
-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
|
||||
swig/python/setup.cfg || die "sed python setup.cfg failed"
|
||||
# -e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local use_python=""
|
||||
|
||||
gdal_src_configure
|
||||
|
||||
if use python; then
|
||||
use_python="yes"
|
||||
python_foreach_impl run_in_build_dir gdal_src_configure
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use perl; then
|
||||
rm "${S}"/swig/perl/*_wrap.cpp
|
||||
emake -C "${S}"/swig/perl generate
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
if use perl ; then
|
||||
pushd "${S}"/swig/perl > /dev/null
|
||||
perl-module_src_configure
|
||||
perl-module_src_compile
|
||||
popd > /dev/null
|
||||
fi
|
||||
|
||||
use doc && emake docs
|
||||
|
||||
compile_python() {
|
||||
rm -f swig/python/*_wrap.cpp
|
||||
emake -C swig/python generate
|
||||
emake -C swig/python build
|
||||
}
|
||||
if use python; then
|
||||
python_foreach_impl run_in_build_dir compile_python
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use perl ; then
|
||||
pushd "${S}"/swig/perl > /dev/null
|
||||
perl-module_src_install
|
||||
popd > /dev/null
|
||||
sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
|
||||
-i GDALmake.opt || die
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
use perl && perl_delete_localpod
|
||||
|
||||
dodoc Doxyfile HOWTO-RELEASE NEWS
|
||||
|
||||
use doc && dohtml html/*
|
||||
|
||||
install_python() {
|
||||
emake -C swig/python DESTDIR="${D}" install
|
||||
}
|
||||
if use python; then
|
||||
python_foreach_impl run_in_build_dir install_python
|
||||
newdoc swig/python/README.txt README-python.txt
|
||||
insinto /usr/share/${PN}/samples
|
||||
doins swig/python/samples/*
|
||||
python_replicate_script "${ED}"/usr/bin/*py
|
||||
fi
|
||||
|
||||
pushd man/man1 > /dev/null
|
||||
for i in * ; do
|
||||
newman ${i} ${i}
|
||||
done
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Check available image and data formats after building with"
|
||||
elog "gdalinfo and ogrinfo (using the --formats switch)."
|
||||
}
|
||||
@ -1,11 +1,5 @@
|
||||
DIST rtabmap-0.10.5.tar.gz 16975400 SHA256 2c783d7a3c872b084bde18466863fda6d8c8247ff279dbee40f1d3da69b1667a SHA512 a144387d6cbe4ad9b656216c269505768a60408ae9486b41d85c8ed0f8a1212b8f598d392c147d042f8b3ade57974b2b8ae6e5ec8c47e6a18f11d53ce8a086e9 WHIRLPOOL 76faf97da79a5c7693b6ca41422c92d5bb47b6c1cc6ccec6658df2721ad1219ba41be3a6c15bf3c9f9d7c7b9e384141d04c1c996fe604edab2b3e03506c7f8c5
|
||||
DIST rtabmap-0.8.2.tar.gz 16314234 SHA256 058006a00e550187ca382308985723573735e64bc7bb833357a47929949ef6b0 SHA512 fc2f3152c9651fc847881d773b788d0845a0c842ee3dd8508f395de0954072a0aeb0d37bf55389e29bcc4d14027845218dbda7ef346f2161669be6570eb785f5 WHIRLPOOL 5ac7b2b30742ff360d7755c016735f59542fe828c80689686a449f3ab4d2e40ad568ae9a0ad8d148cfd221e43da463e0409238b5a94ce600970a9d0162f97368
|
||||
DIST rtabmap-0.8.3.tar.gz 16331307 SHA256 cc19a57fc50f5bccd25dda2383993f04164074348f6a75b1f83b8ae152b88ff8 SHA512 a326d3704bc4f1eeb1cc102919192b2999c49b1a5460ccb9c39721829a80e7889a4549b203f5aafeacdbe482e114de275508e3b22cb0a466cfa831e736766a30 WHIRLPOOL 7a338f58c0731b3ae9e2793432a720099cd84634b2115fa8d97b31066afa2fc8ec348a6c9e25fba691f6051d52ab1af62dddbac00dffc27c99a9658b52154011
|
||||
DIST rtabmap-0.9.0.tar.gz 16871134 SHA256 d64afbf4075e249665a0d19259f40c587c8cebb11b70d60ad8c48b6822066ba1 SHA512 86002dbdbca917901b0a17c1eca948d012c5bd4b29bf334b093478b740a07b3bce6699340df41f64e477be19dad3be757bca6dba962939fba1ecb3c8462f9891 WHIRLPOOL 06d1201a4d7339df4941b45ce6785781659da96e8b2ab9f281bd13a23fa4f68b0f5e70b23e6479300cc128044e44159f8b9c73ac14cd631c704e9a66ad496a1e
|
||||
EBUILD rtabmap-0.10.5.ebuild 1283 SHA256 507175cbba91086fe97f0a3797affbb36cb56df5634e98c43b725dc83e51f13c SHA512 a0496f23624449e4632e02799ee2da0fa2d4d5383fa4f8d020a8586c96c6e57fad817bc6b8b777b28a1235cc80772fc351d0f5bf4fd805d05a1556ae7939127f WHIRLPOOL f301570fe3da2df85f5dbb099076d697c80c136e39b670d325b157106e5963a3f1198846de1ae3f0d5997b521b5147b84459d07452b6cd5639e720a9c9023cd1
|
||||
EBUILD rtabmap-0.8.2.ebuild 1010 SHA256 27dbdb88d3c6251adc2602c13d0131f894fc52970d86f0b349691f8b438d6af6 SHA512 b131bafb9bee3f63a8b8bf7016b18518b2c3ad088ce5bc65ef4c614d4421e7262814f2eb336eaac790083fe4525f09672dfcbed6a2db35a5b1634f39304dfd57 WHIRLPOOL 281107f1bf461209bcc00f957d57374c0ed1c86052567a02cfc3f951d39d8f94746f8def1033faca2b8318ed4b154cd4252ce7f4545c3752153f2a27dba1848e
|
||||
EBUILD rtabmap-0.8.3.ebuild 1010 SHA256 27dbdb88d3c6251adc2602c13d0131f894fc52970d86f0b349691f8b438d6af6 SHA512 b131bafb9bee3f63a8b8bf7016b18518b2c3ad088ce5bc65ef4c614d4421e7262814f2eb336eaac790083fe4525f09672dfcbed6a2db35a5b1634f39304dfd57 WHIRLPOOL 281107f1bf461209bcc00f957d57374c0ed1c86052567a02cfc3f951d39d8f94746f8def1033faca2b8318ed4b154cd4252ce7f4545c3752153f2a27dba1848e
|
||||
EBUILD rtabmap-0.9.0.ebuild 1332 SHA256 b9fb18082acff5d58a73e530b6d654f35695ea5f9236f6acbb8a2142f60d0582 SHA512 4af91cdb0b7cc4cf859e0886f194fa9c6a26682bcf923246a4e89987a7547cbff20294ecadb229e5cacf6ae6c64e11f856f5c48e6fe206d369c146a7deebe28b WHIRLPOOL 5f18285cfed31741702d638aabf6dffdc0e5fa73e29c6ec31e79481ac643b7b270b62c2952841f8bdaf1d7606c5a26b4725b687c0795c710d264f83d8d6d49b5
|
||||
EBUILD rtabmap-9999.ebuild 1283 SHA256 507175cbba91086fe97f0a3797affbb36cb56df5634e98c43b725dc83e51f13c SHA512 a0496f23624449e4632e02799ee2da0fa2d4d5383fa4f8d020a8586c96c6e57fad817bc6b8b777b28a1235cc80772fc351d0f5bf4fd805d05a1556ae7939127f WHIRLPOOL f301570fe3da2df85f5dbb099076d697c80c136e39b670d325b157106e5963a3f1198846de1ae3f0d5997b521b5147b84459d07452b6cd5639e720a9c9023cd1
|
||||
MISC ChangeLog 1053 SHA256 f6e96514bdd10853d2f27d8488980c2bd834504bb45a968977c6752f71fb998e SHA512 438383cd08ea2ee419ff529c40db5eeea01f2f523f9c56c777b2167fc8a60910c05e44d21e9659ddc21e0ff7faa2b6f0b6b2b024eb7fe3f90778742d2cccbcce WHIRLPOOL 061911391e5ef465cedc455cb3f755440952982a426c59aa72a43eee84ffbfff5f67bede96c2d4c8eb13fe6ec703dc77438e15a1ad667ad60b8c4195541532b8
|
||||
MISC metadata.xml 457 SHA256 94753b4059e48d663e79760c3f80b1e57ab924cf875da34f412954d9378256ec SHA512 67e0ee82991649aed5a7ac49bbdbd750b50af8181be8d342fa0703b1aad26f8f5b0bd34c64292bfb3ff0e7abc1b3ebe6888be9ad201b4e4ec229f558f909a08e WHIRLPOOL 9b73be35c3fb44d94ba354aca9b364ca3d5a38654d39c5c08c306f818e1ce22bbb0c5d9caad8be1208dc23977eacc59146c7b453d20ec2521f90f1d56e0cba07
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/introlab/rtabmap"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake-utils multilib
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64"
|
||||
SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
|
||||
HOMEPAGE="http://introlab.github.io/rtabmap/"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="qt4 openni2"
|
||||
|
||||
RDEPEND="
|
||||
media-libs/opencv:=
|
||||
sci-libs/pcl[openni]
|
||||
sci-libs/vtk
|
||||
sys-libs/zlib
|
||||
openni2? ( dev-libs/OpenNI2 )
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtsvg:4
|
||||
dev-qt/qtcore:4
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
use openni2 || sed -e 's/OpenNI2)/DiSaBlEd)/' -i CMakeLists.txt || die
|
||||
use qt4 || sed -e 's/Qt4/DiSaBlEd/' -i CMakeLists.txt || die
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/introlab/rtabmap"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake-utils multilib
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64"
|
||||
SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
|
||||
HOMEPAGE="http://introlab.github.io/rtabmap/"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="qt4 openni2"
|
||||
|
||||
RDEPEND="
|
||||
media-libs/opencv:=
|
||||
sci-libs/pcl[openni]
|
||||
sci-libs/vtk
|
||||
sys-libs/zlib
|
||||
openni2? ( dev-libs/OpenNI2 )
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtsvg:4
|
||||
dev-qt/qtcore:4
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
use openni2 || sed -e 's/OpenNI2)/DiSaBlEd)/' -i CMakeLists.txt || die
|
||||
use qt4 || sed -e 's/Qt4/DiSaBlEd/' -i CMakeLists.txt || die
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/introlab/rtabmap"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake-utils multilib
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
KEYWORDS=""
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64"
|
||||
SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
|
||||
HOMEPAGE="http://introlab.github.io/rtabmap/"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="ieee1394 openni2 qt4 qt5"
|
||||
|
||||
RDEPEND="
|
||||
media-libs/opencv:=
|
||||
sci-libs/pcl[openni]
|
||||
sci-libs/vtk
|
||||
sys-libs/zlib
|
||||
ieee1394? ( media-libs/libdc1394 )
|
||||
openni2? ( dev-libs/OpenNI2 )
|
||||
!qt5? (
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtsvg:4
|
||||
dev-qt/qtcore:4
|
||||
)
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtsvg:5
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=()
|
||||
use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
|
||||
use openni2 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
|
||||
use qt4 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
|
||||
use qt5 && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Yao <ryao@gentoo.org>
|
||||
Date: Fri, 18 Sep 2015 08:32:52 -0400
|
||||
Subject: [PATCH] Discard on zvols should not exceed the length of a block
|
||||
|
||||
37f9dac592bf5889c3efb305c48ac39b4c7dd140 replaced the end-start
|
||||
calculation with a cached value, but neglected to update it on discard
|
||||
operations. This can cause us to discard data not requested, causing
|
||||
data loss on zvols.
|
||||
|
||||
Reported-by: Richard Connon <richard.connon@zynstra.com>
|
||||
Signed-off-by: Richard Yao <ryao@gentoo.org>
|
||||
---
|
||||
module/zfs/zvol.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
|
||||
index 492f8ff..c5a8071 100644
|
||||
--- a/module/zfs/zvol.c
|
||||
+++ b/module/zfs/zvol.c
|
||||
@@ -661,6 +661,7 @@ zvol_discard(struct bio *bio)
|
||||
if (!(bio->bi_rw & REQ_SECURE)) {
|
||||
start = P2ROUNDUP(start, zv->zv_volblocksize);
|
||||
end = P2ALIGN(end, zv->zv_volblocksize);
|
||||
+ size = end - start;
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
2.4.6
|
||||
|
||||
@ -0,0 +1,154 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
AT_M4DIR="config"
|
||||
AUTOTOOLS_AUTORECONF="1"
|
||||
AUTOTOOLS_IN_SOURCE_BUILD="1"
|
||||
|
||||
inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
|
||||
|
||||
if [ ${PV} == "9999" ] ; then
|
||||
inherit git-2
|
||||
EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
|
||||
else
|
||||
inherit eutils versionator
|
||||
SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz"
|
||||
S="${WORKDIR}/zfs-zfs-${PV}"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
|
||||
HOMEPAGE="http://zfsonlinux.org/"
|
||||
|
||||
LICENSE="CDDL debug? ( GPL-2+ )"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug +rootfs"
|
||||
RESTRICT="debug? ( strip ) test"
|
||||
|
||||
DEPEND="
|
||||
=sys-kernel/spl-${PV}*
|
||||
dev-lang/perl
|
||||
virtual/awk
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
!sys-fs/zfs-fuse
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
CONFIG_CHECK="!DEBUG_LOCK_ALLOC
|
||||
BLK_DEV_LOOP
|
||||
EFI_PARTITION
|
||||
IOSCHED_NOOP
|
||||
MODULES
|
||||
!PAX_KERNEXEC_PLUGIN_METHOD_OR
|
||||
!PAX_USERCOPY_SLABS
|
||||
ZLIB_DEFLATE
|
||||
ZLIB_INFLATE
|
||||
"
|
||||
|
||||
use debug && CONFIG_CHECK="${CONFIG_CHECK}
|
||||
FRAME_POINTER
|
||||
DEBUG_INFO
|
||||
!DEBUG_INFO_REDUCED
|
||||
"
|
||||
|
||||
use rootfs && \
|
||||
CONFIG_CHECK="${CONFIG_CHECK}
|
||||
BLK_DEV_INITRD
|
||||
DEVTMPFS
|
||||
"
|
||||
|
||||
kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
|
||||
|
||||
[ ${PV} != "9999" ] && \
|
||||
{ kernel_is le 4 2 || die "Linux 4.2 is the latest supported version."; }
|
||||
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [ ${PV} != "9999" ]
|
||||
then
|
||||
# Fix zvol data loss regression
|
||||
# https://github.com/zfsonlinux/zfs/pull/3798
|
||||
epatch "${FILESDIR}/${P}-discard-on-zvol-fix.patch"
|
||||
fi
|
||||
|
||||
# Remove GPLv2-licensed ZPIOS unless we are debugging
|
||||
use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
|
||||
|
||||
# Set module revision number
|
||||
[ ${PV} != "9999" ] && \
|
||||
{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
|
||||
use custom-cflags || strip-flags
|
||||
filter-ldflags -Wl,*
|
||||
|
||||
set_arch_to_kernel
|
||||
local myeconfargs=(${myeconfargs}
|
||||
--bindir="${EPREFIX}/bin"
|
||||
--sbindir="${EPREFIX}/sbin"
|
||||
--with-config=kernel
|
||||
--with-linux="${KV_DIR}"
|
||||
--with-linux-obj="${KV_OUT_DIR}"
|
||||
--with-spl="${EROOT}usr/src/${SPL_PATH}"
|
||||
--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
|
||||
$(use_enable debug)
|
||||
)
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
|
||||
dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
linux-mod_pkg_postinst
|
||||
|
||||
# Remove old modules
|
||||
if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
|
||||
then
|
||||
ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
|
||||
ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
|
||||
ewarn "Automatically removing old modules to avoid problems."
|
||||
rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
|
||||
rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
|
||||
fi
|
||||
|
||||
if use x86 || use arm
|
||||
then
|
||||
ewarn "32-bit kernels will likely require increasing vmalloc to"
|
||||
ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
|
||||
fi
|
||||
|
||||
ewarn "This version of ZFSOnLinux includes support for new feature flags"
|
||||
ewarn "that are incompatible with previous versions. GRUB2 support for"
|
||||
ewarn "/boot with the new feature flags is not yet available."
|
||||
ewarn "Do *NOT* upgrade root pools to use the new feature flags."
|
||||
ewarn "Any new pools will be created with the new feature flags by default"
|
||||
ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
|
||||
ewarn "create a newpool that is backward compatible wih GRUB2, use "
|
||||
ewarn
|
||||
ewarn "zpool create -d -o feature@async_destroy=enabled "
|
||||
ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
|
||||
ewarn " -o feature@spacemap_histogram=enabled"
|
||||
ewarn " -o feature@enabled_txg=enabled "
|
||||
ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
|
||||
ewarn " ..."
|
||||
ewarn
|
||||
ewarn "GRUB2 support will be updated as soon as either the GRUB2"
|
||||
ewarn "developers do a tag or the Gentoo developers find time to backport"
|
||||
ewarn "support from GRUB2 HEAD."
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
DIST pybugz-0.11.1.tar.gz 23787 SHA256 05b2cef8a655ab34d9279e6341d16a803af07958e72320125cb30a3fd6bc8eec SHA512 bc2277a8e900765bf1799e5de65de5df8184bf50b6ca7c78478a9f43ceb78aa66bcb53c3fd89f7b194b13fa14ad162291d559554a8cb073c071104e2b0978c61 WHIRLPOOL cb8f9a36cac6ae7a42e43d6d9489e2593c8ae76153b769bf04f269967e6477e37b1633d30969c4d7c6d0bcd816aff7bd189a1754c06769e3ea0f761eda3c16db
|
||||
EBUILD pybugz-0.11.1.ebuild 1099 SHA256 6b0cf4d4bfa760dd3b0d52c28cca3c31bf22dab3c0aeeae68c1c2aaee190eb19 SHA512 93a4d9c307b433173a858a6c5a42044dd9e8b158bd0cc4662956e61917f77237ccd8b48ae45d922c1ff0a3ae82f0a1cdfee39d47de846f606d08d6c2605f4d82 WHIRLPOOL 3b8e3e1434555aca4a4726b574e338105c14bb7c4b8300da94f57067fe5992172b489e17155f536f733753dc6a9c7271f6d66a02404d681dacb56f00be5fac91
|
||||
EBUILD pybugz-9999.ebuild 1108 SHA256 74350baf0403fb53ff922b3fd1bfdc04fb6927255ff697960088f361363ab61c SHA512 870a436426bc0670310c9883e201d52ae3693d58fe58a0cf314a8eb2d624b72d1cc7a2a82a1b9e5f374b3b1f1c78022a2b4d3517eda81ab72a12f40a21f28006 WHIRLPOOL 77adb622b534f85acba15cc3e9921c559530596827554ec37a97f3062460d5a1ae37d9046043abf80bbb84b914e77a1b003ff039d84dead686192ee44a4ae456
|
||||
EBUILD pybugz-9999.ebuild 1187 SHA256 a79ae09f55bf26ef7fddca2c265b0b7d8edd4f2873b241e9b61a04d1dd816ac9 SHA512 7c33e410e744e389ef364a1446d8d9a686a7d58a55f6bcdc562e389b5f3e2e3c7c250ea396eecd45eeef28fc4196832809850a641e72fe186e42de06caf762ea WHIRLPOOL 28db0500661660a1fccdb2577318b05527a37e97cd8838d268b2089e3298b88930920ba6e2fac9b0cf9b3023b559f2f986be2b9146d30b2078b1a95dd36b46f6
|
||||
MISC ChangeLog 17975 SHA256 5ddbb99603f0a93012f74df5f6ea4a175548ac40ba7de35436ee0fd0dca61549 SHA512 8569fef0e47f48dd91e74464eda92b1d7a2133f7e3d9f4287215fda6b43a85e8a134ddf89e7336302e1d5dd4859ec03f9308da2874410b8582eefbced02f4b0d WHIRLPOOL 838ea4b12941e7e703fe1555fbb9eb221d4526d653f30605e6f4a34b17363fa25ede7d4a779cb9ca5740af085c7a0ee4c1f67425e8d13d4058de932ee6993c73
|
||||
MISC metadata.xml 293 SHA256 d7c957e70cddd71d95c3a64361f7ee3ad8b7bf2912727318a12c22effb7030ef SHA512 d029c887b4454a9eadbc45f4149d21ce32d9006e2440a3350caf6e32b3331af3651ac3a4b3ab8a4ea62d6bb547b70be9c9cc844b998140f6e2e36065657f0cc9 WHIRLPOOL 991f59c339a976ac8927715f2c10e3c248e89c2396d35404e627b295f5d01447d6acfd929c37df677d7e5b24a1e803f5e52d074c3539e2ad03de37d8fc48fda9
|
||||
|
||||
Loading…
Reference in new issue