root
11 years ago
parent
63c2d011ff
commit
c97d744cfa
@ -0,0 +1,25 @@
|
||||
diff -Naur sphinxbase-0.8/test/regression/Makefile.am sphinxbase-0.8.new/test/regression/Makefile.am
|
||||
--- sphinxbase-0.8/test/regression/Makefile.am 2012-12-05 06:05:39.000000000 -0800
|
||||
+++ sphinxbase-0.8.new/test/regression/Makefile.am 2013-10-08 13:05:15.498853962 -0700
|
||||
@@ -33,9 +33,19 @@
|
||||
|
||||
# Disable sphinx_fe tests for now if fixed-point due to imprecision
|
||||
if FIXED_POINT
|
||||
-TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh
|
||||
+TESTS = test-cepview.sh test-sphinx_pitch.sh
|
||||
else
|
||||
-TESTS = $(srcdir)/test-*.sh
|
||||
+TESTS = \
|
||||
+ test-cepview.sh \
|
||||
+ test-sphinx_fe-ctl.sh \
|
||||
+ test-sphinx_fe-dct.sh \
|
||||
+ test-sphinx_fe-dither-seed.sh \
|
||||
+ test-sphinx_fe-logspec2cep.sh \
|
||||
+ test-sphinx_fe-logspec.sh \
|
||||
+ test-sphinx_fe.sh \
|
||||
+ test-sphinx_fe-smoothspec.sh \
|
||||
+ test-sphinx_jsgf2fsg.sh \
|
||||
+ test-sphinx_pitch.sh
|
||||
endif
|
||||
|
||||
EXTRA_DIST += $(TESTS)
|
||||
@ -0,0 +1,18 @@
|
||||
diff -r -U 5 conky-1.9.0/src/specials.c conky-1.9.0/src/specials.c
|
||||
--- conky-1.9.0/src/specials.c 2012-05-03 22:13:47.000000000 +0100
|
||||
+++ conky-1.9.0/src/specials.c 2013-02-27 21:16:15.856669451 +0000
|
||||
@@ -186,12 +186,12 @@
|
||||
g->scale = defscale;
|
||||
if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {
|
||||
return strndup(buf, text_buffer_size);
|
||||
}
|
||||
buf[0] = '\0';
|
||||
- g->height = 25;
|
||||
- g->width = 0;
|
||||
+ g->height = default_graph_height;
|
||||
+ g->width = default_graph_width;
|
||||
if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {
|
||||
return NULL;
|
||||
}
|
||||
g->scale = defscale;
|
||||
if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-renpy/eselect-renpy-0.3.ebuild,v 1.1 2013/10/26 20:27:46 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit games
|
||||
|
||||
DESCRIPTION="Manages renpy symlink"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="app-admin/eselect-lib-bin-symlink"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
pkg_setup() { :; }
|
||||
|
||||
src_prepare() {
|
||||
sed \
|
||||
-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
|
||||
"${FILESDIR}"/renpy.eselect-${PV} > "${WORKDIR}"/renpy.eselect || die
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/eselect/modules
|
||||
doins renpy.eselect
|
||||
}
|
||||
|
||||
pkg_preinst() { :; }
|
||||
|
||||
pkg_postinst() { :; }
|
||||
@ -0,0 +1,15 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id: renpy.eselect-0.3,v 1.1 2013/10/26 20:27:46 hasufell Exp $
|
||||
|
||||
DESCRIPTION="Manage default renpy version"
|
||||
MAINTAINER="hasufell@gentoo.org"
|
||||
VERSION="0.3"
|
||||
|
||||
SYMLINK_PATH="@GAMES_BINDIR@/renpy"
|
||||
SYMLINK_TARGETS=( renpy-6.14 renpy-6.15 renpy-6.16 )
|
||||
SYMLINK_DESCRIPTION='default renpy'
|
||||
SYMLINK_CRUCIAL=1
|
||||
|
||||
inherit bin-symlink
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST logrotate-3.8.4.tar.gz 55610 SHA256 d363e9212527ada6e566ad04e18d21eb7d70a3bfd0710671c7b75a2c0dd96e29 SHA512 c3a509d8d9140b4a584c9ca731df10d8df17abfd38fc1263d19b2d25560cd047cf2036c7a5ffa738036599f55616b3c73456af63c40ec087672a263e8895aee0 WHIRLPOOL af914183c0f1358f3e9ce06509b922af43bd5a0e9a942a8b3d546b0966540fb27920cf8d61141d50d99f7157ee35e8f90b42fb4765bc5c4bc3400a9c17b1c156
|
||||
DIST logrotate-3.8.5.tar.gz 57818 SHA256 6b695bffeb54ed6f6c9a560780231a55c3548a24b96cb06f33b84f8cea600079 SHA512 7548a8a1841eccb28272ca13d7305315c921563486d3a31bda6e53699d450fdaeb819e181c003200042de869f3526b5fdf162dd4a2fe435264027c197d3f5f1c WHIRLPOOL 4491ebde1710c9f37045c6eed7a3191d86e315fb9bc9c43da68c3b1b0049da54d3270f0e38de4b4c08165b383a6909bd93e1a9f199814f7a3154b94e6f466251
|
||||
DIST logrotate-3.8.6.tar.gz 58502 SHA256 0e0ef0609afe9ef2a2ef6cae307b5ca618ddd349923ccce6e064513afd4e9d92 SHA512 ecd70cc1043e38bfdbfa74f6932e688f16d5e99aa13edf804d8d556eccc6c8e00377f818cb566ff1124dcae5f88c1aa624a86fc3339ac4b29562ade6541c8750 WHIRLPOOL 261c46fa2821f136518efdf42a77d9e3a145e62d1dd325d4cc269aa72f344c1534710aeca52f4c1564bb812afe4201f12c068a020382dee6c1a06f6d19cf35b3
|
||||
DIST logrotate-3.8.7.tar.gz 58898 SHA256 f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64 SHA512 6c0dc106e2a9e9d2cd7ac12af869bc152db7d046a1c6d1b75810fb2fc7a7f382b3c3f1dc54b9fb9a9eee248c1c66a9f5ce86804f15b49ac0210313c231b49e7f WHIRLPOOL 6ba7fd7eca8435575c96a5534fe9dbe098235ee2319f2ab8e279d94fa6de3ea0e53cd78eeabd643e4da049f585df9a901681b61d0d339131f45fe580aa0eb198
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -Nur a/logrotate.c b/logrotate.c
|
||||
--- a/logrotate.c 2013-06-10 14:02:36.000000000 +0200
|
||||
+++ b/logrotate.c 2013-06-18 18:34:09.329999708 +0200
|
||||
@@ -2035,7 +2035,7 @@
|
||||
diff -Nuar a/logrotate.c b/logrotate.c
|
||||
--- a/logrotate.c 2013-10-10 10:43:36.000000000 +0200
|
||||
+++ b/logrotate.c 2013-10-26 17:56:06.549999428 +0200
|
||||
@@ -2046,7 +2046,7 @@
|
||||
}
|
||||
|
||||
/* Hack to hide earlier bug */
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Nur a/config.c b/config.c
|
||||
--- a/config.c 2013-06-10 14:02:36.000000000 +0200
|
||||
+++ b/config.c 2013-06-18 18:35:33.009999706 +0200
|
||||
diff -Nuar a/config.c b/config.c
|
||||
--- a/config.c 2013-07-31 13:34:31.000000000 +0200
|
||||
+++ b/config.c 2013-10-26 17:57:58.309999425 +0200
|
||||
@@ -255,7 +255,9 @@
|
||||
char *pattern;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.5.ebuild,v 1.2 2013/06/18 17:25:26 nimiux Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.7.ebuild,v 1.1 2013/10/26 16:27:42 nimiux Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.8.4.ebuild,v 1.1 2013/08/25 18:43:45 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit eutils gnome2 readme.gentoo
|
||||
|
||||
DESCRIPTION="Archive manager for GNOME"
|
||||
HOMEPAGE="http://fileroller.sourceforge.net/"
|
||||
|
||||
LICENSE="GPL-2+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
IUSE="nautilus packagekit"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
|
||||
|
||||
# gdk-pixbuf used extensively in the source
|
||||
# cairo used in eggtreemultidnd.c
|
||||
# pango used in fr-window
|
||||
RDEPEND="
|
||||
>=app-arch/libarchive-3:=
|
||||
>=dev-libs/glib-2.29.14:2
|
||||
>=dev-libs/json-glib-0.14
|
||||
>=x11-libs/gtk+-3.6:3
|
||||
>=x11-libs/libnotify-0.4.3:=
|
||||
sys-apps/file
|
||||
x11-libs/cairo
|
||||
x11-libs/gdk-pixbuf:2
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/pango
|
||||
nautilus? ( >=gnome-base/nautilus-3 )
|
||||
packagekit? ( app-admin/packagekit-base )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/desktop-file-utils
|
||||
>=dev-util/intltool-0.40.0
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# eautoreconf needs:
|
||||
# gnome-base/gnome-common
|
||||
|
||||
DISABLE_AUTOFORMATTING="yes"
|
||||
DOC_CONTENTS="
|
||||
${PN} is a frontend for several archiving utilities. If you want a
|
||||
particular achive format support, see ${HOMEPAGE}
|
||||
and install the relevant package. For example:
|
||||
7-zip - app-arch/p7zip
|
||||
ace - app-arch/unace
|
||||
arj - app-arch/arj
|
||||
cpio - app-arch/cpio
|
||||
deb - app-arch/dpkg
|
||||
iso - app-cdr/cdrtools
|
||||
jar,zip - app-arch/zip and app-arch/unzip
|
||||
lha - app-arch/lha
|
||||
lzop - app-arch/lzop
|
||||
rar - app-arch/unrar or app-arch/unar
|
||||
rpm - app-arch/rpm
|
||||
unstuff - app-arch/stuffit
|
||||
zoo - app-arch/zoo"
|
||||
|
||||
src_prepare() {
|
||||
# Use absolute path to GNU tar since star doesn't have the same
|
||||
# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
|
||||
epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
|
||||
|
||||
# File providing Gentoo package names for various archivers
|
||||
cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
|
||||
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
|
||||
# --disable-debug because enabling it adds -O0 to CFLAGS
|
||||
gnome2_src_configure \
|
||||
--disable-run-in-place \
|
||||
--disable-static \
|
||||
--disable-debug \
|
||||
--enable-magic \
|
||||
--enable-libarchive \
|
||||
--with-smclient=xsmp \
|
||||
$(use_enable nautilus nautilus-actions) \
|
||||
$(use_enable packagekit) \
|
||||
ITSTOOL=$(type -P true)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
From 40d2c298a7b938a974fe83b609293348a7d59bbd Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bacchilega <paobac@src.gnome.org>
|
||||
Date: Sun, 29 Sep 2013 16:30:29 +0000
|
||||
Subject: libarchive: fixed failure when extracting some tar archives
|
||||
|
||||
do not try to restore the creation time;
|
||||
do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute
|
||||
|
||||
[bug #709035]
|
||||
---
|
||||
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
|
||||
index 37e3008..e465fe8 100644
|
||||
--- a/src/fr-archive-libarchive.c
|
||||
+++ b/src/fr-archive-libarchive.c
|
||||
@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry,
|
||||
|
||||
/* times */
|
||||
|
||||
- if (archive_entry_ctime_is_set (entry)) {
|
||||
- g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry));
|
||||
- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry));
|
||||
- }
|
||||
-
|
||||
- if (archive_entry_mtime_is_set (entry)) {
|
||||
+ if (archive_entry_mtime_is_set (entry))
|
||||
g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry));
|
||||
- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry));
|
||||
- }
|
||||
|
||||
/* username */
|
||||
|
||||
@@ -529,7 +522,8 @@ restore_modification_time (GHashTable *created_folders,
|
||||
|
||||
info = g_file_info_new ();
|
||||
g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED));
|
||||
- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
|
||||
+ if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET)
|
||||
+ g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
|
||||
result = _g_file_set_attributes_from_info (file, info, cancellable, error);
|
||||
|
||||
g_object_unref (info);
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -0,0 +1,40 @@
|
||||
From 80c36ae3c84dce8716eb5b74ddb8c73da5824f13 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bacchilega <paobac@src.gnome.org>
|
||||
Date: Fri, 11 Oct 2013 19:38:27 +0000
|
||||
Subject: ignore errors when setting file attributes
|
||||
|
||||
[bug #709932]
|
||||
---
|
||||
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
|
||||
index 44aaad2..19c5a1d 100644
|
||||
--- a/src/fr-archive-libarchive.c
|
||||
+++ b/src/fr-archive-libarchive.c
|
||||
@@ -751,7 +751,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
GFileInfo *info;
|
||||
|
||||
info = _g_file_info_create_from_entry (entry, extract_data);
|
||||
- _g_file_set_attributes_from_info (file, info, cancellable, &load_data->error);
|
||||
+ _g_file_set_attributes_from_info (file, info, cancellable, NULL);
|
||||
g_hash_table_insert (created_folders, g_object_ref (file), g_object_ref (info));
|
||||
|
||||
g_object_unref (info);
|
||||
@@ -774,7 +774,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
if (r != ARCHIVE_EOF)
|
||||
load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
|
||||
else
|
||||
- _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, &load_data->error);
|
||||
+ _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, NULL);
|
||||
break;
|
||||
|
||||
case AE_IFLNK:
|
||||
@@ -805,7 +805,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
}
|
||||
|
||||
if (load_data->error == NULL)
|
||||
- restore_modification_time (created_folders, cancellable, &load_data->error);
|
||||
+ restore_modification_time (created_folders, cancellable, NULL);
|
||||
|
||||
if ((load_data->error == NULL) && (r != ARCHIVE_EOF))
|
||||
load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -0,0 +1,186 @@
|
||||
From 4bf8552f8e60c8d4ec65e360451c6998198052db Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bacchilega <paobac@src.gnome.org>
|
||||
Date: Wed, 04 Sep 2013 10:02:11 +0000
|
||||
Subject: libarchive: restore the folders modification time correctly
|
||||
|
||||
when honoring the skip_older and overwrite flags ignore the
|
||||
directories created during the extraction process.
|
||||
|
||||
[bug #697756]
|
||||
---
|
||||
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
|
||||
index 3b73c48..37e3008 100644
|
||||
--- a/src/fr-archive-libarchive.c
|
||||
+++ b/src/fr-archive-libarchive.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "file-utils.h"
|
||||
#include "fr-error.h"
|
||||
#include "fr-archive-libarchive.h"
|
||||
+#include "gio-utils.h"
|
||||
#include "glib-utils.h"
|
||||
#include "typedefs.h"
|
||||
|
||||
@@ -547,6 +548,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
LoadData *load_data;
|
||||
GHashTable *checked_folders;
|
||||
GHashTable *created_folders;
|
||||
+ GHashTable *folders_created_during_extraction;
|
||||
struct archive *a;
|
||||
struct archive_entry *entry;
|
||||
int r;
|
||||
@@ -556,6 +558,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
|
||||
checked_folders = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL);
|
||||
created_folders = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, g_object_unref);
|
||||
+ folders_created_during_extraction = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL);
|
||||
fr_archive_progress_set_total_files (load_data->archive, extract_data->n_files_to_extract);
|
||||
|
||||
a = archive_read_new ();
|
||||
@@ -590,11 +593,14 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
archive_read_data_skip (a);
|
||||
continue;
|
||||
}
|
||||
+
|
||||
file = g_file_get_child (extract_data->destination, relative_path);
|
||||
|
||||
/* honor the skip_older and overwrite options */
|
||||
|
||||
- if (extract_data->skip_older || ! extract_data->overwrite) {
|
||||
+ if ((g_hash_table_lookup (folders_created_during_extraction, file) == NULL)
|
||||
+ && (extract_data->skip_older || ! extract_data->overwrite))
|
||||
+ {
|
||||
GFileInfo *info;
|
||||
|
||||
info = g_file_query_info (file,
|
||||
@@ -652,7 +658,18 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
&& (g_hash_table_lookup (checked_folders, parent) == NULL)
|
||||
&& ! g_file_query_exists (parent, cancellable))
|
||||
{
|
||||
- if (g_file_make_directory_with_parents (parent, cancellable, &load_data->error)) {
|
||||
+ if (! _g_file_make_directory_with_parents (parent,
|
||||
+ folders_created_during_extraction,
|
||||
+ cancellable,
|
||||
+ &local_error))
|
||||
+ {
|
||||
+ if (! g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
|
||||
+ load_data->error = local_error;
|
||||
+ else
|
||||
+ g_clear_error (&local_error);
|
||||
+ }
|
||||
+
|
||||
+ if (load_data->error == NULL) {
|
||||
GFile *grandparent;
|
||||
|
||||
grandparent = g_object_ref (parent);
|
||||
@@ -736,7 +753,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
load_data->error = g_error_copy (local_error);
|
||||
g_error_free (local_error);
|
||||
}
|
||||
- else {
|
||||
+ if (load_data->error == NULL) {
|
||||
GFileInfo *info;
|
||||
|
||||
info = _g_file_info_create_from_entry (entry, extract_data);
|
||||
@@ -803,6 +820,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
|
||||
if (load_data->error != NULL)
|
||||
g_simple_async_result_set_from_error (result, load_data->error);
|
||||
|
||||
+ g_hash_table_unref (folders_created_during_extraction);
|
||||
g_hash_table_unref (created_folders);
|
||||
g_hash_table_unref (checked_folders);
|
||||
archive_read_free (a);
|
||||
diff --git a/src/gio-utils.c b/src/gio-utils.c
|
||||
index 9d9f708..b317694 100644
|
||||
--- a/src/gio-utils.c
|
||||
+++ b/src/gio-utils.c
|
||||
@@ -1483,3 +1483,73 @@ _g_file_load_buffer_finish (GFile *file,
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
+
|
||||
+
|
||||
+static gboolean
|
||||
+_g_file_make_directory_and_add_to_created_folders (GFile *file,
|
||||
+ GHashTable *created_folders,
|
||||
+ GCancellable *cancellable,
|
||||
+ GError **error)
|
||||
+{
|
||||
+ gboolean result;
|
||||
+
|
||||
+ result = g_file_make_directory (file, cancellable, error);
|
||||
+ if (result && (g_hash_table_lookup (created_folders, file) == NULL))
|
||||
+ g_hash_table_insert (created_folders, g_object_ref (file), GINT_TO_POINTER (1));
|
||||
+
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+gboolean
|
||||
+_g_file_make_directory_with_parents (GFile *file,
|
||||
+ GHashTable *created_folders,
|
||||
+ GCancellable *cancellable,
|
||||
+ GError **error)
|
||||
+{
|
||||
+ GError *local_error = NULL;
|
||||
+ GFile *work_file = NULL;
|
||||
+ GList *list = NULL, *l;
|
||||
+
|
||||
+ g_return_val_if_fail (G_IS_FILE (file), FALSE);
|
||||
+
|
||||
+ _g_file_make_directory_and_add_to_created_folders (file, created_folders, cancellable, &local_error);
|
||||
+ if ((local_error == NULL) || (local_error->code != G_IO_ERROR_NOT_FOUND)) {
|
||||
+ if (local_error != NULL)
|
||||
+ g_propagate_error (error, local_error);
|
||||
+ return local_error == NULL;
|
||||
+ }
|
||||
+
|
||||
+ work_file = g_object_ref (file);
|
||||
+ while ((local_error != NULL) && (local_error->code == G_IO_ERROR_NOT_FOUND)) {
|
||||
+ GFile *parent_file;
|
||||
+
|
||||
+ parent_file = g_file_get_parent (work_file);
|
||||
+ if (parent_file == NULL)
|
||||
+ break;
|
||||
+
|
||||
+ g_clear_error (&local_error);
|
||||
+ _g_file_make_directory_and_add_to_created_folders (parent_file, created_folders, cancellable, &local_error);
|
||||
+
|
||||
+ g_object_unref (work_file);
|
||||
+ work_file = g_object_ref (parent_file);
|
||||
+
|
||||
+ if ((local_error != NULL) && (local_error->code == G_IO_ERROR_NOT_FOUND))
|
||||
+ list = g_list_prepend (list, parent_file); /* Transfer ownership of ref */
|
||||
+ else
|
||||
+ g_object_unref (parent_file);
|
||||
+ }
|
||||
+
|
||||
+ for (l = list; (local_error == NULL) && (l != NULL); l = l->next)
|
||||
+ _g_file_make_directory_and_add_to_created_folders ((GFile *) l->data, created_folders, cancellable, &local_error);
|
||||
+
|
||||
+ _g_object_unref (work_file);
|
||||
+ _g_object_list_unref (list);
|
||||
+
|
||||
+ if (local_error != NULL) {
|
||||
+ g_propagate_error (error, local_error);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ return _g_file_make_directory_and_add_to_created_folders (file, created_folders, cancellable, error);
|
||||
+}
|
||||
diff --git a/src/gio-utils.h b/src/gio-utils.h
|
||||
index f784c41..0d7dd3c 100644
|
||||
--- a/src/gio-utils.h
|
||||
+++ b/src/gio-utils.h
|
||||
@@ -177,5 +177,10 @@ gboolean _g_file_load_buffer_finish (GFile *file,
|
||||
char **buffer,
|
||||
gsize *buffer_size,
|
||||
GError **error);
|
||||
+gboolean _g_file_make_directory_with_parents
|
||||
+ (GFile *file,
|
||||
+ GHashTable *created_folders,
|
||||
+ GCancellable *cancellable,
|
||||
+ GError **error);
|
||||
|
||||
#endif /* _GIO_UTILS_H */
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -1,3 +1,4 @@
|
||||
DIST lrzip-0.44.tar.bz2 171770 SHA256 3b8aca1de2be674b6a5244fad8d7976771a43281693d0dccedde6ca45f3499d9 SHA512 2cd8ccdab2a124ad822d7be29b7fd3e42571d9d2619cadc55171e58d035712b7b4ca3f5a199080eb83f5f48b258c6668f0d4126735ab76ae4298303601dd8039 WHIRLPOOL afe7b3aa0dd0fc6ad16d1283d2716757ac50516603a88e5e6ef9b44fb6c2ee096eda456c1f5ed5888078c0094d41525cf65a28246f92894b85b6816d88f56f61
|
||||
DIST lrzip-0.611.tar.bz2 470847 SHA256 351081ede4bacd37eb0f3a6013702154765edbd70e0ebcda8c321e7dd7209998 SHA512 056f6a2f201877616edf835f5ef86e269824bae0d49838797d320c453b10e740a518afcde3ae5c48b9c0cffaa986fd2baa3c2a5d0b5fef63806680095c915810 WHIRLPOOL e4b86d3777dab5d4dda8a622e42e473759de2b03e8fbab15e8eb73884d80afbbb66ecf23c26405de5d13215ed8bdc0c0de15f8f9da7fefa546c06e7420e86e59
|
||||
DIST lrzip-0.614.tar.bz2 491995 SHA256 65024d69d1773f3ccf84508a481d7de128c03d1cf9750b5803aead4a24522763 SHA512 6c82d7b4cc6081fb4f102a34f3a5ecf834b3fa3d222ac9dd4f3f0615c83610c08315eae9cc98291bd5e3eb71453cf391cdad4db980012e4368d16d80f34d2bd8 WHIRLPOOL 1669d9e551786f81c3849b2bfb813422cccc21c9d00104b58d42a0470ae9b8633339ef88ead6c5956eea92ac6800ee9b259fbfb15d1b22aa45fe92db7040cf68
|
||||
DIST lrzip-0.616.tar.bz2 493886 SHA256 982d5a8db4d8bbbced6e33fbbcd589c9b3fc4275110155d7bd71cbeff4a235ae SHA512 f578034fa41c5be6df9b9d8e7efe5014229e1acecdd5d6090c26322e1e46db98e3bc17d780eca96342a0bcb56b8e78b008b3293520b82c1bbbd5a96e423d4b3f WHIRLPOOL bc7b22a579de42657c46f4dad426dfdb5cc37e1f54955cb66722ccbfc9b66d19194eb1f1a4d9f545de7859de7903d57854a1af647ff6c3341907fcc874351d94
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/lrzip/lrzip-0.616.ebuild,v 1.1 2013/10/26 10:22:22 yngwin Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
|
||||
HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README"
|
||||
SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/lzo
|
||||
app-arch/bzip2
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}
|
||||
x86? ( dev-lang/nasm )
|
||||
virtual/perl-PodParser"
|
||||
|
||||
src_configure() {
|
||||
econf --docdir="/usr/share/doc/${P}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
rm "${D}/usr/share/doc/${P}/COPYING"
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
|
||||
index 6816f37..ec437e4 100644
|
||||
--- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
|
||||
+++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
|
||||
@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then
|
||||
else
|
||||
Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]"
|
||||
fi
|
||||
+ elif [ -f /etc/gentoo-release ]; then
|
||||
+ if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then
|
||||
+ KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}"
|
||||
+ elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then
|
||||
+ KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}"
|
||||
+ else
|
||||
+ Error "Could not find Gentoo kernel"
|
||||
+ fi
|
||||
else
|
||||
Error "Could not find a matching kernel in /boot !"
|
||||
fi
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/rear/rear-1.15-r1.ebuild,v 1.1 2013/10/26 13:37:26 tomwij Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Fully automated disaster recovery supporting a broad variety of backup strategies and scenarios."
|
||||
HOMEPAGE="http://relax-and-recover.org/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
IUSE="udev"
|
||||
|
||||
RDEPEND="dev-libs/openssl
|
||||
net-dialup/mingetty
|
||||
net-fs/nfs-utils
|
||||
sys-apps/iproute2
|
||||
sys-apps/lsb-release
|
||||
sys-apps/util-linux
|
||||
sys-block/parted
|
||||
sys-boot/syslinux
|
||||
virtual/cdrtools
|
||||
udev? ( virtual/udev )
|
||||
"
|
||||
|
||||
src_prepare () {
|
||||
epatch "${FILESDIR}/${P}-add-support-for-gentoo-kernels.patch"
|
||||
}
|
||||
|
||||
src_compile () { :; }
|
||||
|
||||
src_install () {
|
||||
# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
|
||||
# drive with the label 'REAR_000' is connected, which in turn is the
|
||||
# default label when running the `rear format` command.
|
||||
if use udev ; then
|
||||
insinto /lib/udev/rules.d
|
||||
doins etc/udev/rules.d/62-${PN}-usb.rules
|
||||
fi
|
||||
|
||||
# Copy main script-file and documentation.
|
||||
dosbin usr/sbin/${PN}
|
||||
doman doc/${PN}.8
|
||||
dodoc README
|
||||
|
||||
# Copy configurations files.
|
||||
insinto /etc
|
||||
doins -r etc/${PN}/
|
||||
|
||||
insinto /usr/share/
|
||||
doins -r usr/share/${PN}/
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST gedit-plugins-2.32.0.tar.bz2 616927 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107 SHA512 c00535a8a166752ef764319eb79fd7dd5a55df495bf0f3de32e287214f5da8ddd32a52c5538d5e8714843e7e724d24aab9f6fca0f1f339fe299a1ffdf264761b WHIRLPOOL d7385fe3682efaeaa5fbc57a8e8fb68480983140daf78643392b6a7b335a2a5e8ce21cc8f04136efcfac6133dd1c1cd65c50eab0b0cbde766eebb850889796eb
|
||||
DIST gedit-plugins-3.8.2.tar.xz 722224 SHA256 ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502 SHA512 eef94558d3782a79b62d29757942a9c0d51d20ea9dae916ed6c682ee742b1fd30bfb8c8fa84077d4879ec520fc0b6c7ed5cf025f2cc2fd17575714bca8e9185d WHIRLPOOL 29018fc347ce7e3f4d23c61273a3f216171eb0a26ce4a8da40ede5ba5cae5eac338fe0700ada8299db8158a81d875a67af3ea23cd586d0a795e8d5f9e8f8004f
|
||||
DIST gedit-plugins-3.8.3.tar.xz 724000 SHA256 2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80 SHA512 49a6b6184b73868997477607d932c3ec7b86344854446d1bf7f6a97b2dfff23918970c07fb2bc3f8380ef76874e5addad809c6dd61a0101067e16c9c3c5ea45e WHIRLPOOL b94f8cebd3d4b5e91d92a10b5610510664fb35f4fa8a0eb3dc91f714916b726e6a94a19b13f7072d9df3589241eeff3e8d51dec1090a47a3764ede5c07ce07c8
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- plugins/terminal/terminal.py~ 2013-06-18 12:16:09.000000000 +0200
|
||||
+++ plugins/terminal/terminal.py 2013-10-26 14:49:48.619158171 +0200
|
||||
@@ -58,8 +58,6 @@
|
||||
self.system_settings.connect("changed::monospace-font-name", self.font_changed)
|
||||
|
||||
self._vte = Vte.Terminal()
|
||||
- self._vte.set_background_image(None)
|
||||
- self._vte.set_background_transparent(False)
|
||||
self.reconfigure_vte()
|
||||
self._vte.set_size(self._vte.get_column_count(), 5)
|
||||
self._vte.set_size_request(200, 50)
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.8.2.ebuild,v 1.1 2013/05/26 11:05:42 pacho Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes" # plugins are dlopened
|
||||
PYTHON_COMPAT=( python3_2 )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit eutils gnome2 multilib python-r1
|
||||
|
||||
DESCRIPTION="Official plugins for gedit"
|
||||
HOMEPAGE="http://live.gnome.org/GeditPlugins"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
|
||||
IUSE_plugins="charmap terminal"
|
||||
IUSE="+python ${IUSE_plugins}"
|
||||
REQUIRED_USE="charmap? ( python ) terminal? ( python )"
|
||||
|
||||
RDEPEND="
|
||||
>=app-editors/gedit-3.7.1[python?]
|
||||
>=dev-libs/glib-2.32:2
|
||||
>=dev-libs/libpeas-1.7.0[gtk,python?]
|
||||
>=x11-libs/gtk+-3.4:3
|
||||
>=x11-libs/gtksourceview-3:3.0
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
>=app-editors/gedit-3[introspection,${PYTHON_USEDEP}]
|
||||
dev-libs/libpeas[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-python/pycairo
|
||||
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
|
||||
>=x11-libs/gtk+-3.4:3[introspection]
|
||||
>=x11-libs/gtksourceview-3:3.0[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
x11-libs/gdk-pixbuf:2[introspection]
|
||||
)
|
||||
charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
|
||||
terminal? ( x11-libs/vte:2.90[introspection] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/intltool-0.40.0
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
# DEFAULT_PLUGINS from configure.ac
|
||||
local myplugins="bookmarks,drawspaces,wordcompletion"
|
||||
|
||||
# python plugins with no extra dependencies beyond what USE=python brings
|
||||
use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,colorschemer,commander,dashboard,joinlines,multiedit,textsize,smartspaces,synctex"
|
||||
|
||||
# python plugins with extra dependencies
|
||||
for plugin in ${IUSE_plugins/+}; do
|
||||
use ${plugin} && myplugins="${myplugins},${plugin}"
|
||||
done
|
||||
|
||||
gnome2_src_configure \
|
||||
--with-plugins=${myplugins} \
|
||||
$(use_enable python)
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST ReText-4.0.1.tar.gz 92892 SHA256 547f4d4cd6ca826963799a55e124ee22bbd2c1dc33fd11dc0d891cb66af8b77e SHA512 7055df357573ea87227bb169d9016e6d94fa7a299461019b12e56f8f1f15738f239dd6a1fbd2b37a84ea66abac4f85af6ae5d0b41e85323fbe10bbe8a6db4a81 WHIRLPOOL bf47d53870c3d3d913d09c3094a6451aa3b11f51126dd26c21e4f0d814fa876dbaba38adeb36c5660ad849742beb024bc567d49825c8f244941b761ff7eef471
|
||||
DIST ReText-4.1.0.tar.gz 125515 SHA256 7fb1207acbe8b6ef87eaeda2338a99214990b68d12c951d71ffaeb9527f08b29 SHA512 ab872dc2fcdd2fcf43ade28b04cf62887d3228f39ecca09778c3d9c29692faabcfe51a61a0e713f710b167aa82aa0e803e09b78492cf43c74aff6240804cab0d WHIRLPOOL 5152bfd47bb93493bb02d86b411bfe3ea64ccc3ed38bcf2f7adfe32907e002fb96b3c1b2b3f9fc2167becb912a4c9fc5e5d68fce5e15aaa8e74c74d1d2cc266a
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.0.ebuild,v 1.1 2013/10/26 23:48:57 tomwij Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python3_2 )
|
||||
PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
|
||||
|
||||
inherit distutils-r1 l10n
|
||||
|
||||
MY_PN="ReText"
|
||||
MY_P="${MY_PN}-${PV/_/~}"
|
||||
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
inherit git-2
|
||||
EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
|
||||
HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="+spell"
|
||||
|
||||
RDEPEND+="
|
||||
dev-python/docutils[${PYTHON_USEDEP}]
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
dev-python/markups[${PYTHON_USEDEP}]
|
||||
dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
|
||||
spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
|
||||
newicon {icons/,}${PN}.png
|
||||
newicon {icons/,}${PN}.svg
|
||||
|
||||
l10n_for_each_disabled_locale_do remove_locale
|
||||
|
||||
make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
|
||||
}
|
||||
|
||||
remove_locale() {
|
||||
find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST scite333.tgz 1992362 SHA256 ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 SHA512 d1bfcf9b83ccd5423c47169f33880b25736931a9a42e543cccd1101fd915ea3b14a51aa74c0879d908f4bb69852059c89f6fdb621731ec43afb6b96b564a7ac3 WHIRLPOOL 390d9d157d8f802ea05db41668115e61cbdb0f47ee81daa85fbbba87d322b527cc33f20af3381db72ce4d9d1eefc7e54188f15397ec5404347ef0a3b45780c8e
|
||||
DIST scite334.tgz 2017827 SHA256 47107d9f063a0f1928add39c8b82d2d1745228bfd25c313f98f19dbabf75c04b SHA512 a4b67607e9f883e13409c1b96dcf250f4836cd97106f6d73ac07d41ace09473ef78687c82463661229d917a327140b5e1f4f43eb5d8cdb2b3ff94316deb95019 WHIRLPOOL 366348d777262a3cc770846411433bb9418841f5edc3caf19b307eaee54f7d18aeab5dedcb234f087bd360ecd68f55156fc59408548f8ae25ecaf8c18171ece8
|
||||
DIST scite335.tgz 2099170 SHA256 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 SHA512 a8a976e58e8190d46162a6ef0834403702460c703bc5904fff95610a40014ed024307d6c0ae727e9bb71868fc4ef339878595e879fcfdec4076ea4e656d6b584 WHIRLPOOL fdd89b02fed78feb50e3ae885a8b918541d949625cee88318db7c066f3ad8f288ee8ae87c627d9eed8217a4a5628acd2ddd56b5421a2ac3b848999a148bae4bd
|
||||
DIST scite336.tgz 2125559 SHA256 9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5 SHA512 da4869fee62e606d44579ffba736b2944c8425e741b6499776aa258275ab5a0def28e0672a7d36da083a39f6acff464158af1e13d197a769c53d90ac5c016312 WHIRLPOOL 3172ba4916c7071d9d83337d779275c5d413450b91a13c6d081c757e504e8e9ff7fe0d3887ae20245c9669404ef9bc19eb0e659cd5f6fb464ce0e2e10a299be8
|
||||
|
||||
@ -0,0 +1,87 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.6.ebuild,v 1.1 2013/10/25 12:55:30 ago Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit toolchain-funcs eutils
|
||||
|
||||
MY_PV=${PV//./}
|
||||
DESCRIPTION="A very powerful editor for programmers"
|
||||
HOMEPAGE="http://www.scintilla.org/SciTE.html"
|
||||
SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
|
||||
|
||||
LICENSE="HPND lua? ( MIT )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE="lua"
|
||||
|
||||
RDEPEND="dev-libs/glib
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:2
|
||||
x11-libs/gdk-pixbuf
|
||||
x11-libs/pango
|
||||
lua? ( >=dev-lang/lua-5 )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
>=sys-apps/sed-4"
|
||||
|
||||
S="${WORKDIR}/${PN}/gtk"
|
||||
|
||||
src_prepare() {
|
||||
cd "${WORKDIR}/scintilla/gtk"
|
||||
sed -i makefile \
|
||||
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
|
||||
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
|
||||
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
|
||||
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
|
||||
-e "s#-Os##" \
|
||||
|| die "error patching makefile"
|
||||
|
||||
cd "${WORKDIR}/scite/gtk"
|
||||
sed -i makefile \
|
||||
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
|
||||
|| die "error patching makefile"
|
||||
|
||||
cd "${S}"
|
||||
sed -i makefile \
|
||||
-e 's#usr/local#usr#g' \
|
||||
-e 's#/gnome/apps/Applications#/applications#' \
|
||||
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
|
||||
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
|
||||
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
|
||||
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
|
||||
-e 's#${D}##' \
|
||||
-e 's#-g root#-g 0#' \
|
||||
-e "s#-Os##" \
|
||||
|| die "error patching makefile"
|
||||
cd "${WORKDIR}"
|
||||
epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C ../../scintilla/gtk AR="$(tc-getAR)"
|
||||
if use lua; then
|
||||
emake
|
||||
else
|
||||
emake NO_LUA=1
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/bin
|
||||
dodir /usr/share/{pixmaps,applications}
|
||||
|
||||
emake prefix="${ED}/usr" install
|
||||
|
||||
# we have to keep this because otherwise it'll break upgrading
|
||||
mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
|
||||
dosym /usr/bin/scite /usr/bin/SciTE
|
||||
|
||||
# replace .desktop file with our own working version
|
||||
rm -f "${ED}/usr/share/applications/SciTE.desktop"
|
||||
domenu "${FILESDIR}/scite.desktop"
|
||||
|
||||
doman ../doc/scite.1
|
||||
dodoc ../README
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST vim-qt-20130201.tar.gz 11620051 SHA256 676bc4a98d25fd80a3e4a3fdf60db26b1417e8a87eacbd8f03c464c4e68a2639 SHA512 9e9c3b16968b800598f47e9e9c81e8c7e13acf720c933883e704aa390980aa47bda2727714caf1aad27228e5a0e3b4eb0ecd19fc56961b49cc07936a272f6463 WHIRLPOOL 6acd6e6e8d889124cad94dfb8be01a2a64402cdaaee6fcfbd3e822e5a2692d4c326b42916a10937c4bfda3cb1c1cba629d1610f24fb9766b5fd2b0c6013a2895
|
||||
DIST vim-qt-20130220.tar.gz 11621543 SHA256 95870899f1dbefe5108ed8cbe7c462cf918954ee5dbf542cd626336488aa7d05 SHA512 05ad7cd0b109285a845653e27aa7a84f6fce1ee0a8ba63b6a8976fb65f5d1f502339aaea4c739626534b7fd936f68d8ccfd15b44c70cbefd0bd041122b647fdd WHIRLPOOL 90fb2b3852071e5df6b5f3d9337d116f3162a854b75f23e4245fd6b0af6c328db900c68414bf16d334e50339c3d894dc5229be0be452bc0b112ee54c95300698
|
||||
DIST vim-qt-20131004.tar.gz 12095789 SHA256 791275d708f5de55a210ae13a4962586918f71c004c96ba6090fec98602de926 SHA512 65696d60c478c88b0dfd2e46e75747bc48a3ad535462babf88542a3e78755789594b8b7b39d33eed4eacfc1158293c41eea02bc38aeb02f69674c9e0b061b041 WHIRLPOOL 7fe3bbbf9e27d4dd9247452a5f83ff56166182ae4b7c833ac7052964afcf44d8bd9aba3a866987fcce65a9e81c06df473baacd7b236bea55dbfc81add8504133
|
||||
|
||||
@ -0,0 +1,88 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20131004.ebuild,v 1.1 2013/10/25 16:34:26 yngwin Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE="threads"
|
||||
inherit eutils fdo-mime flag-o-matic python-single-r1
|
||||
|
||||
DESCRIPTION="Qt GUI version of the Vim text editor"
|
||||
HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-2
|
||||
EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
|
||||
git://github.com/equalsraf/${PN}.git
|
||||
git://gitorious.org/${PN}/${PN}.git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
S="${WORKDIR}/${PN}-package-${PV}"
|
||||
fi
|
||||
|
||||
LICENSE="vim"
|
||||
SLOT="0"
|
||||
IUSE="acl cscope debug gpm lua luajit nls perl python ruby"
|
||||
|
||||
RDEPEND="app-admin/eselect-vi
|
||||
>=app-editors/vim-core-7.4.22[acl?]
|
||||
sys-libs/ncurses
|
||||
>=dev-qt/qtcore-4.7.0:4
|
||||
>=dev-qt/qtgui-4.7.0:4
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
cscope? ( dev-util/cscope )
|
||||
gpm? ( sys-libs/gpm )
|
||||
lua? ( luajit? ( dev-lang/luajit )
|
||||
!luajit? ( dev-lang/lua ) )
|
||||
nls? ( virtual/libintl )
|
||||
perl? ( dev-lang/perl )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/ctags
|
||||
sys-devel/autoconf
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
pkg_setup() {
|
||||
export LC_COLLATE="C" # prevent locale brokenness bug #82186
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
local myconf="--with-features=huge --enable-multibyte"
|
||||
myconf+=" $(use_enable acl)"
|
||||
myconf+=" $(use_enable gpm)"
|
||||
myconf+=" $(use_enable nls)"
|
||||
myconf+=" $(use_enable lua luainterp)"
|
||||
myconf+=" $(use_with luajit)"
|
||||
myconf+=" $(use_enable perl perlinterp)"
|
||||
myconf+=" $(use_enable python pythoninterp)"
|
||||
myconf+=" $(use_enable ruby rubyinterp)"
|
||||
myconf+=" --enable-gui=qt --with-vim-name=qvim --with-x"
|
||||
|
||||
if ! use cscope ; then
|
||||
sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed failed'
|
||||
fi
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin src/qvim
|
||||
doicon -s 64 src/qt/icons/vim-qt.png
|
||||
make_desktop_entry qvim Vim-qt vim-qt "Qt;TextEditor;Development;"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
@ -0,0 +1,235 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.34.ebuild,v 1.1 2013/10/25 22:10:07 matsl Exp $
|
||||
|
||||
# Note: xemacs currently does not work with a hardened profile. If you
|
||||
# want to use xemacs on a hardened profile then compile with the
|
||||
# -nopie flag in CFLAGS or help fix bug #75028.
|
||||
|
||||
EAPI=4
|
||||
|
||||
export WANT_AUTOCONF="2.5"
|
||||
inherit eutils flag-o-matic multilib
|
||||
|
||||
DESCRIPTION="highly customizable open source text editor and application development system"
|
||||
HOMEPAGE="http://www.xemacs.org/"
|
||||
SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
|
||||
http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
|
||||
IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
|
||||
|
||||
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
|
||||
|
||||
RDEPEND="
|
||||
berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
|
||||
>=sys-libs/zlib-1.1.4
|
||||
>=dev-libs/openssl-0.9.6
|
||||
>=media-libs/audiofile-0.2.3
|
||||
gpm? ( >=sys-libs/gpm-1.19.6 )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
ldap? ( net-nds/openldap )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
nas? ( media-libs/nas )
|
||||
X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
|
||||
dnd? ( x11-libs/dnd )
|
||||
motif? ( >=x11-libs/motif-2.3:0[xft=] )
|
||||
athena? ( x11-libs/libXaw )
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
|
||||
neXt? ( x11-libs/neXtaw )
|
||||
xface? ( media-libs/compface )
|
||||
tiff? ( media-libs/tiff )
|
||||
png? ( >=media-libs/libpng-1.2 )
|
||||
jpeg? ( virtual/jpeg )
|
||||
canna? ( app-i18n/canna )
|
||||
freewnn? ( app-i18n/freewnn )
|
||||
>=sys-libs/ncurses-5.2"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
>=app-admin/eselect-emacs-1.2"
|
||||
|
||||
PDEPEND="app-xemacs/xemacs-base
|
||||
mule? ( app-xemacs/mule-base )"
|
||||
|
||||
src_unpack() {
|
||||
default_src_unpack
|
||||
|
||||
use neXt && unpack NeXT_XEmacs.tar.gz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
|
||||
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=""
|
||||
|
||||
if use X; then
|
||||
|
||||
myconf="${myconf} --with-widgets=athena"
|
||||
myconf="${myconf} --with-dialogs=athena"
|
||||
myconf="${myconf} --with-menubars=lucid"
|
||||
myconf="${myconf} --with-scrollbars=lucid"
|
||||
if use motif ; then
|
||||
myconf="--with-widgets=motif"
|
||||
myconf="${myconf} --with-dialogs=motif"
|
||||
myconf="${myconf} --with-scrollbars=motif"
|
||||
myconf="${myconf} --with-menubars=lucid"
|
||||
fi
|
||||
if use athena or use Xaw3d ; then
|
||||
myconf="--with-scrollbars=athena"
|
||||
fi
|
||||
|
||||
if use Xaw3d; then
|
||||
myconf="${myconf} --with-athena=3d"
|
||||
elif use neXt; then
|
||||
myconf="${myconf} --with-athena=next"
|
||||
else
|
||||
myconf="${myconf} --with-athena=xaw"
|
||||
fi
|
||||
|
||||
use dnd && myconf="${myconf} --with-dragndrop --with-offix"
|
||||
|
||||
myconf="${myconf} $(use_with tiff )"
|
||||
myconf="${myconf} $(use_with png )"
|
||||
myconf="${myconf} $(use_with jpeg )"
|
||||
myconf="${myconf} $(use_with xface )"
|
||||
|
||||
use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
|
||||
myconf="${myconf} --with-xft=no"
|
||||
|
||||
else
|
||||
myconf="${myconf}
|
||||
--without-x
|
||||
--without-xpm
|
||||
--without-dragndrop
|
||||
--with-xft=no
|
||||
--with-gif=no"
|
||||
fi
|
||||
|
||||
if use mule ; then
|
||||
myconf="${myconf} --with-mule"
|
||||
|
||||
if use xim ; then
|
||||
if use motif ; then
|
||||
myconf="${myconf} --with-xim=motif"
|
||||
else
|
||||
myconf="${myconf} --with-xim=xlib"
|
||||
fi
|
||||
else
|
||||
myconf="${myconf} --with-xim=no"
|
||||
fi
|
||||
|
||||
myconf="${myconf} $(use_with canna )"
|
||||
myconf="${myconf} $(use_with freewnn wnn )"
|
||||
fi
|
||||
|
||||
# This determines the type of sounds we are playing
|
||||
local soundconf="native"
|
||||
|
||||
# This determines how these sounds should be played
|
||||
use nas && soundconf="${soundconf},nas"
|
||||
use alsa && soundconf="${soundconf},alsa"
|
||||
|
||||
myconf="${myconf} --with-sound=${soundconf}"
|
||||
|
||||
if use gdbm || use berkdb ; then
|
||||
use gdbm && mydb="gdbm"
|
||||
use berkdb && mydb="${mydb},berkdb"
|
||||
|
||||
myconf="${myconf} --with-database=${mydb}"
|
||||
else
|
||||
myconf="${myconf} --without-database"
|
||||
fi
|
||||
|
||||
use debug && myconf="${myconf} --with-debug" ||
|
||||
myconf="${myconf} --with-optimization"
|
||||
|
||||
econf ${myconf} \
|
||||
$(use_with gif ) \
|
||||
$(use_with gpm ) \
|
||||
$(use_with postgres postgresql ) \
|
||||
$(use_with ldap ) \
|
||||
$(use_with eolconv file-coding ) \
|
||||
$(use_with pop ) \
|
||||
--prefix=/usr \
|
||||
--with-ncurses \
|
||||
--with-msw=no \
|
||||
--with-mail-locking=flock \
|
||||
--with-site-lisp=yes \
|
||||
--with-site-modules=yes \
|
||||
--with-newgc \
|
||||
--enable-option-checking=no \
|
||||
--with-last-packages=/usr/lib/xemacs \
|
||||
|| die "configuration failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake prefix="${D}"/usr \
|
||||
mandir="${D}"/usr/share/man/man1 \
|
||||
infodir="${D}"/usr/share/info \
|
||||
libdir="${D}"/usr/$(get_libdir) \
|
||||
datadir="${D}"/usr/share \
|
||||
install gzip-el || die
|
||||
|
||||
# Rename some applications installed in bin so that it is clear
|
||||
# which application installed them and so that conflicting
|
||||
# packages (emacs) can't clobber the actual applications.
|
||||
# Addresses bug #62991.
|
||||
for i in b2m ctags etags ; do
|
||||
mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
|
||||
done
|
||||
|
||||
# rename man pages
|
||||
for i in ctags etags; do
|
||||
mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
|
||||
done
|
||||
|
||||
# install base packages directories
|
||||
dodir /usr/lib/xemacs/xemacs-packages/
|
||||
dodir /usr/lib/xemacs/site-packages/
|
||||
dodir /usr/lib/xemacs/site-modules/
|
||||
dodir /usr/lib/xemacs/site-lisp/
|
||||
|
||||
if use mule;
|
||||
then
|
||||
dodir /usr/lib/xemacs/mule-packages
|
||||
fi
|
||||
|
||||
# remove extraneous info files
|
||||
cd "${D}"/usr/share/info
|
||||
rm -f dir info.info texinfo* termcap* standards*
|
||||
|
||||
cd "${S}"
|
||||
dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
|
||||
|
||||
newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
|
||||
|
||||
domenu "${FILESDIR}"/${PN}.desktop
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect emacs update ifunset
|
||||
|
||||
einfo "*************************************************"
|
||||
einfo "If you are upgrading from XEmacs 21.4 you should note the following"
|
||||
einfo "incompatibilities:"
|
||||
einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
|
||||
einfo "- The X resource class has changed from Emacs to XEmacs,"
|
||||
einfo " settings in your .Xdefaults file should be updated accordingly."
|
||||
|
||||
if use xft;
|
||||
then
|
||||
einfo "You have enabled Xft font support. Xft requires font names to be provided"
|
||||
einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild,v 1.1 2013/10/26 08:58:24 aballier Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit emul-linux-x86
|
||||
|
||||
LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
|
||||
KEYWORDS="-* ~amd64"
|
||||
IUSE="abi_x86_32"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
|
||||
~app-emulation/emul-linux-x86-xlibs-${PV}
|
||||
~app-emulation/emul-linux-x86-opengl-${PV}
|
||||
abi_x86_32? (
|
||||
>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
|
||||
)"
|
||||
# RDEPEND on opengl stuff needed due cairo, bug #410213
|
||||
|
||||
my_gdk_pixbuf_query_loaders() {
|
||||
# causes segfault if set
|
||||
unset __GL_NO_DSO_FINALIZER
|
||||
|
||||
local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
|
||||
if [ -z "${tmp_file}" ]; then
|
||||
ewarn "Cannot create temporary file"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
|
||||
cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
|
||||
else
|
||||
ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
|
||||
fi
|
||||
rm "${tmp_file}"
|
||||
}
|
||||
|
||||
my_pango_querymodules() {
|
||||
PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
|
||||
einfo "Generating pango modules listing..."
|
||||
|
||||
mkdir -p "${PANGO_CONFDIR}"
|
||||
local pango_conf="${PANGO_CONFDIR}/pango.modules"
|
||||
local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
|
||||
if [ -z "${tmp_file}" ]; then
|
||||
ewarn "Cannot create temporary file"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if pango-querymodules32 > "${tmp_file}"; then
|
||||
cat "${tmp_file}" > "${pango_conf}"
|
||||
else
|
||||
ewarn "Cannot update pango.modules, file generation failed"
|
||||
fi
|
||||
rm "${tmp_file}"
|
||||
}
|
||||
|
||||
my_gtk_query_immodules() {
|
||||
GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
|
||||
einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
|
||||
|
||||
mkdir -p "${GTK2_CONFDIR}"
|
||||
local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
|
||||
local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
|
||||
if [ -z "${tmp_file}" ]; then
|
||||
ewarn "Cannot create temporary file"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
|
||||
cat "${tmp_file}" > "${gtk_conf}"
|
||||
else
|
||||
ewarn "Cannot update gtk.immodules, file generation failed"
|
||||
fi
|
||||
rm "${tmp_file}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
|
||||
ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
|
||||
emul-linux-x86_src_prepare
|
||||
|
||||
# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
|
||||
mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
|
||||
mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
|
||||
mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
|
||||
|
||||
# Remove migrated stuff.
|
||||
use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
#bug 169058
|
||||
for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
|
||||
[[ -L ${l} ]] && rm -f ${l}
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
my_pango_querymodules
|
||||
my_gtk_query_immodules
|
||||
my_gdk_pixbuf_query_loaders
|
||||
|
||||
# gdk-pixbuf.loaders should be in their CHOST directories respectively.
|
||||
if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
|
||||
ewarn
|
||||
ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
|
||||
ewarn "multilib systems, please remove it by hand."
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
usr/lib32/libpixman-1.so
|
||||
usr/lib32/libpixman-1.so.0
|
||||
usr/lib32/libpixman-1.so.0.30.2
|
||||
usr/lib32/pkgconfig/pixman-1.pc
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -482,6 +482,11 @@
|
||||
DISTRO=UBUNTU
|
||||
fi
|
||||
fi
|
||||
+
|
||||
+if test -f /etc/gentoo-release; then
|
||||
+ DISTRO=GENTOO
|
||||
+fi
|
||||
+
|
||||
if test -f /etc/arch-release; then
|
||||
DISTRO=ARCHLINUX
|
||||
fi
|
||||
@ -0,0 +1,16 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1487,8 +1487,10 @@
|
||||
|
||||
dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
|
||||
dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
|
||||
-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
|
||||
-AC_SUBST([LIBTOOL])
|
||||
+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
|
||||
+dnl AC_SUBST([LIBTOOL])
|
||||
+LT_INIT
|
||||
+
|
||||
|
||||
dnl Produce output files.
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
@ -0,0 +1,57 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -621,28 +621,36 @@
|
||||
fi
|
||||
|
||||
dnl Check for netpbm programs (optional).
|
||||
-AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
|
||||
-AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
|
||||
-AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
|
||||
-AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
|
||||
-if test "x$PBMTEXT" != "xno"; then
|
||||
- AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
|
||||
-fi
|
||||
-if test "x$PNMTOPNG" != "xno"; then
|
||||
- AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
|
||||
-fi
|
||||
-if test "x$BMPTOPNM" != "xno"; then
|
||||
- AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
|
||||
-fi
|
||||
-if test "x$PAMCUT" != "xno"; then
|
||||
- AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
|
||||
-fi
|
||||
+AC_ARG_ENABLE([icoutils],
|
||||
+ AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]),
|
||||
+ [enable_icoutils=no],
|
||||
+ [enable_icoutils=yes])
|
||||
+AS_IF([test "enable_icoutils" != "xno"],
|
||||
+ [
|
||||
+ AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
|
||||
+ AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
|
||||
+ AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
|
||||
+ AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
|
||||
+ if test "x$PBMTEXT" != "xno"; then
|
||||
+ AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
|
||||
+ fi
|
||||
+ if test "x$PNMTOPNG" != "xno"; then
|
||||
+ AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
|
||||
+ fi
|
||||
+ if test "x$BMPTOPNM" != "xno"; then
|
||||
+ AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
|
||||
+ fi
|
||||
+ if test "x$PAMCUT" != "xno"; then
|
||||
+ AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
|
||||
+ fi
|
||||
|
||||
dnl Check for icoutils (optional).
|
||||
AC_CHECK_PROGS([WRESTOOL],[wrestool],[no])
|
||||
if test "x$WRESTOOL" != "xno"; then
|
||||
- AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
|
||||
+ AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
|
||||
fi
|
||||
+],
|
||||
+[])
|
||||
|
||||
dnl Check for QEMU for running binaries on this $host_cpu, fall
|
||||
dnl back to basic 'qemu'. Allow the user to override it.
|
||||
@ -0,0 +1,21 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1491,11 +1491,12 @@
|
||||
])
|
||||
|
||||
# check for gtk-doc
|
||||
-m4_ifdef([GTK_DOC_CHECK], [
|
||||
- GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
||||
-],[
|
||||
- AM_CONDITIONAL([ENABLE_GTK_DOC], false)
|
||||
-])
|
||||
+#m4_ifdef([GTK_DOC_CHECK], [
|
||||
+# GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
||||
+#],[
|
||||
+# AM_CONDITIONAL([ENABLE_GTK_DOC], false)
|
||||
+#])
|
||||
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
||||
|
||||
dnl Library versioning.
|
||||
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -88,9 +88,6 @@
|
||||
if HAVE_HASKELL
|
||||
SUBDIRS += haskell
|
||||
endif
|
||||
-if HAVE_PHP
|
||||
-SUBDIRS += php
|
||||
-endif
|
||||
if HAVE_ERLANG
|
||||
SUBDIRS += erlang erlang/examples
|
||||
endif
|
||||
@ -1,7 +1,3 @@
|
||||
DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
|
||||
DIST libvirt-1.1.2-2a32bbbf.tar.xz 8824 SHA256 38d49c3c5f28b809ccce011f23690181f0191a8f50ea2fce882f26637b29af58 SHA512 6fc13dd3766502a2dcb8dc452b8a69c89e1bf84fd800cadc407d6f927294e795814e42e6479d0bd228f457abdb89c7220b19d4c24e60a0c44ba4f1d5385034af WHIRLPOOL 1bcd0ba80eb603ccce5cfe3ac18e143327ecc098b640351bbc5e727f44b1963758a375718e71e33d3e80a5541633d816d8729a3ce431df8d139321b0af8b9d30
|
||||
DIST libvirt-1.1.2-e89bdf01.tar.xz 1776 SHA256 ff85291f594221a6fbf8ad39d577bdec776f4c22081c7904c4463f8bed50ce5b SHA512 357b03c7e1b4a4b3e0a862d92fd81b800c58cd702c4c88228397ef06b1125f1b565b28821a3a62d93a01338ad70987509836d677051718c1174dc82078ae6855 WHIRLPOOL e3e8dec57def09e9f1aed29571befcb73095ec0b61730361556e745a5732f1744d58e448db768aef82bd6033cd40471f7c7c7a2432623f6e3ee921fca1e2f571
|
||||
DIST libvirt-1.1.2.tar.gz 26069691 SHA256 16648af54d3e162f5cc5445d970ec29a0bd55b1dbcb568a05533c4c2f25965e3 SHA512 9244640221393abe3c4e48a5a5b87838af4f20ae0664949a5c116aa1dd4568818c41b52077274ade907310fd22a627bde69df1cd53c6c398d10f98f83c217b2c WHIRLPOOL 7fcf575016f26a3570fafe9fc22edc0bd35d01dfeb93a3c90d5c90770677cd07bafb3057de0857961f082c174bd42fd9a88ecb049c42a7388557ab7f51737c86
|
||||
DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
|
||||
DIST libvirt-1.1.3-e3fb8465.tar.xz 9176 SHA256 868819430f7d1af65498c5212b8a9ac17b0af2c05ca2aba9d84b2ea680ffc0fe SHA512 61567d47165d788ebb485ca862b1d08bd507aca7d06376742fa44097498a9c684d2536f9573b09ce1fd8bd25ce36ed189359eefb4b01e5e7c50e3636df0bf62f WHIRLPOOL ebec68ce6b20528c040eec7f3f2a1ec38252d24e939fa4f362577a70d5cec88f51eac04379da5470e09b79bcf4d3ebbecc95f4d5a4285b37559f6c0a3ad5a63e
|
||||
DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
|
||||
|
||||
@ -0,0 +1,129 @@
|
||||
#!/sbin/runscript
|
||||
|
||||
description="Virtual Machine Management daemon (libvirt)"
|
||||
extra_started_commands="reload halt"
|
||||
description_halt="Stops the libvirt daemon without stopping your VMs"
|
||||
description_reload="Restarts the libvirt daemon without stopping your VMs"
|
||||
|
||||
depend() {
|
||||
USE_FLAG_FIREWALLD
|
||||
use USE_FLAG_AVAHI USE_FLAG_ISCSI USE_FLAG_RBD dbus virtlockd
|
||||
after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
|
||||
}
|
||||
|
||||
libvirtd_virsh() {
|
||||
local mode=$1
|
||||
shift
|
||||
|
||||
# Silence errors because virsh always throws an error about
|
||||
# not finding the hypervisor version when connecting to libvirtd
|
||||
LC_ALL=C virsh -c ${mode}:///system "$@" 2>/dev/null
|
||||
}
|
||||
|
||||
libvirtd_dom_list() {
|
||||
# Make sure that it wouldn't be confused if the domain name
|
||||
# contains the word running.
|
||||
libvirtd_virsh $1 list | awk '$3 == "running" { print $1 }'
|
||||
}
|
||||
|
||||
libvirtd_dom_count() {
|
||||
# Make sure that it wouldn't be confused if the domain name
|
||||
# contains the word running.
|
||||
libvirtd_virsh $1 list | awk 'BEGIN { count = 0 } \
|
||||
$3 == "running" { count++ } \
|
||||
END { print count }'
|
||||
}
|
||||
|
||||
libvirtd_net_list() {
|
||||
# The purpose of the awk is to avoid networks with 'active' in the name
|
||||
libvirtd_virsh $1 net-list | awk '$2 == "active" { print $1 }'
|
||||
}
|
||||
|
||||
libvirtd_net_count() {
|
||||
# The purpose of the awk is to avoid networks with 'active' in the name
|
||||
libvirtd_virsh $1 net-list | awk 'BEGIN { count = 0 } \
|
||||
$2 == "active" { count++ } \
|
||||
END { print count }'
|
||||
}
|
||||
|
||||
|
||||
start() {
|
||||
ebegin "Starting libvirtd"
|
||||
start-stop-daemon --start \
|
||||
--env KRB5_KTNAME=/etc/libvirt/krb5.tab \
|
||||
--exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
local counter=
|
||||
local vm_name=
|
||||
local net_name=
|
||||
local dom_id=
|
||||
|
||||
ebegin "Stopping libvirtd"
|
||||
# try to shutdown all (KVM/Qemu) domains
|
||||
if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
|
||||
&& [ "$(libvirtd_dom_count qemu)" != "0" ] ; then
|
||||
|
||||
einfo " Shutting down domain(s):"
|
||||
for dom_id in $(libvirtd_dom_list qemu) ; do
|
||||
vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)"
|
||||
einfo " ${vm_name}"
|
||||
libvirtd_virsh qemu ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null
|
||||
done
|
||||
|
||||
if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
|
||||
counter="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
|
||||
else
|
||||
counter=500
|
||||
fi
|
||||
|
||||
if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
|
||||
einfo " Waiting ${counter} seconds while domains shutdown ..."
|
||||
DOM_COUNT="$(libvirtd_dom_count qemu)"
|
||||
while [ ${DOM_COUNT} -gt 0 ] && [ ${counter} -gt 0 ] ; do
|
||||
DOM_COUNT="$(libvirtd_dom_count qemu)"
|
||||
sleep 1
|
||||
counter=$((${counter} - 1))
|
||||
echo -n "."
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "$(libvirtd_dom_count qemu)" != "0" ] ; then
|
||||
eerror " !!! Some guests are still running, stopping anyway"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if [ "${LIBVIRTD_KVM_NET_SHUTDOWN}" != "no" ] \
|
||||
&& [ "$(libvirtd_net_count qemu)" != "0" ]; then
|
||||
|
||||
einfo " Shutting down network(s):"
|
||||
for net_name in $(libvirtd_net_list qemu); do
|
||||
einfo " ${net_name}"
|
||||
libvirtd_virsh qemu net-destroy ${net_name} > /dev/null
|
||||
done
|
||||
|
||||
if [ "$(libvirtd_net_count qemu)" != "0" ]; then
|
||||
eerror " !!! Some networks are still active, stopping anyway"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Now actually stop the daemon
|
||||
start-stop-daemon --stop --quiet --exec \
|
||||
/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
|
||||
eend $?
|
||||
}
|
||||
|
||||
halt() {
|
||||
ebegin "Stopping libvirtd without shutting down your VMs"
|
||||
start-stop-daemon --stop --quiet --exec \
|
||||
/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
halt
|
||||
start
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/virtlockd.init,v 1.1 2013/10/25 20:06:42 cardoe Exp $
|
||||
|
||||
description="libvirt virtual machine lock manager"
|
||||
command="/usr/sbin/virtlockd"
|
||||
command_args="-d"
|
||||
pidfile="/var/run/virtlockd.pid"
|
||||
|
||||
depend() {
|
||||
after ntp-client ntpd nfs nfsmount corosync
|
||||
}
|
||||
@ -1,432 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.2-r3.ebuild,v 1.3 2013/10/02 06:23:14 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
BACKPORTS=2a32bbbf
|
||||
AUTOTOOLIZE=yes
|
||||
|
||||
MY_P="${P/_rc/-rc}"
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-2
|
||||
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
|
||||
AUTOTOOLIZE=yes
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
|
||||
ftp://libvirt.org/libvirt/${MY_P}.tar.gz
|
||||
${BACKPORTS:+
|
||||
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="amd64 x86"
|
||||
fi
|
||||
S="${WORKDIR}/${P%_rc*}"
|
||||
|
||||
DESCRIPTION="C toolkit to manipulate virtual machines"
|
||||
HOMEPAGE="http://www.libvirt.org/"
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
|
||||
nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
|
||||
selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
|
||||
systemd"
|
||||
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
|
||||
lxc? ( caps libvirtd )
|
||||
openvz? ( libvirtd )
|
||||
qemu? ( libvirtd )
|
||||
uml? ( libvirtd )
|
||||
vepa? ( macvtap )
|
||||
virtualbox? ( libvirtd )
|
||||
xen? ( libvirtd )
|
||||
virt-network? ( libvirtd )
|
||||
firewalld? ( virt-network )
|
||||
python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
# gettext.sh command is used by the libvirt command wrappers, and it's
|
||||
# non-optional, so put it into RDEPEND.
|
||||
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
|
||||
# package will use 3 by default. Since we don't have slot pinning in an API,
|
||||
# we must go with the most recent
|
||||
RDEPEND="sys-libs/readline
|
||||
sys-libs/ncurses
|
||||
>=net-misc/curl-7.18.0
|
||||
dev-libs/libgcrypt
|
||||
>=dev-libs/libxml2-2.7.6
|
||||
dev-libs/libnl:3
|
||||
>=net-libs/gnutls-1.0.25
|
||||
net-libs/libssh2
|
||||
sys-apps/dmidecode
|
||||
>=sys-apps/util-linux-2.17
|
||||
sys-devel/gettext
|
||||
>=net-analyzer/netcat6-1.0-r2
|
||||
app-misc/scrub
|
||||
audit? ( sys-process/audit )
|
||||
avahi? ( >=net-dns/avahi-0.6[dbus] )
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
fuse? ( >=sys-fs/fuse-2.8.6 )
|
||||
iscsi? ( sys-block/open-iscsi )
|
||||
lxc? ( sys-power/pm-utils )
|
||||
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
|
||||
nfs? ( net-fs/nfs-utils )
|
||||
numa? (
|
||||
>sys-process/numactl-2.0.2
|
||||
sys-process/numad
|
||||
)
|
||||
openvz? ( sys-kernel/openvz-sources )
|
||||
parted? (
|
||||
>=sys-block/parted-1.8[device-mapper]
|
||||
sys-fs/lvm2
|
||||
)
|
||||
pcap? ( >=net-libs/libpcap-1.0.0 )
|
||||
policykit? ( >=sys-auth/polkit-0.9 )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qemu? (
|
||||
>=app-emulation/qemu-0.13.0
|
||||
dev-libs/yajl
|
||||
sys-power/pm-utils
|
||||
)
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.85 )
|
||||
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
|
||||
xen? ( app-emulation/xen-tools app-emulation/xen )
|
||||
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
|
||||
virt-network? ( net-dns/dnsmasq
|
||||
>=net-firewall/iptables-1.4.10
|
||||
net-misc/radvd
|
||||
net-firewall/ebtables
|
||||
sys-apps/iproute2[-minimal]
|
||||
firewalld? ( net-firewall/firewalld )
|
||||
)
|
||||
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
|
||||
# one? ( dev-libs/xmlrpc-c )
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
app-text/xhtml1
|
||||
dev-lang/perl
|
||||
dev-libs/libxslt"
|
||||
|
||||
DOC_CONTENTS="For the basic networking support (bridged and routed networks)
|
||||
you don't need any extra software. For more complex network modes
|
||||
including but not limited to NATed network, you can enable the
|
||||
'virt-network' USE flag.\n\n
|
||||
If you are using dnsmasq on your system, you will have
|
||||
to configure /etc/dnsmasq.conf to enable the following settings:\n\n
|
||||
bind-interfaces\n
|
||||
interface or except-interface\n\n
|
||||
Otherwise you might have issues with your existing DNS server."
|
||||
|
||||
LXC_CONFIG_CHECK="
|
||||
~CGROUPS
|
||||
~CGROUP_FREEZER
|
||||
~CGROUP_DEVICE
|
||||
~CGROUP_CPUACCT
|
||||
~CGROUP_SCHED
|
||||
~CGROUP_PERF
|
||||
~BLK_CGROUP
|
||||
~NET_CLS_CGROUP
|
||||
~NETPRIO_CGROUP
|
||||
~CPUSETS
|
||||
~RESOURCE_COUNTERS
|
||||
~NAMESPACES
|
||||
~UTS_NS
|
||||
~IPC_NS
|
||||
~PID_NS
|
||||
~NET_NS
|
||||
~USER_NS
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
~VETH
|
||||
~MACVLAN
|
||||
~POSIX_MQUEUE
|
||||
~SECURITYFS
|
||||
~!GRKERNSEC_CHROOT_MOUNT
|
||||
~!GRKERNSEC_CHROOT_DOUBLE
|
||||
~!GRKERNSEC_CHROOT_PIVOT
|
||||
~!GRKERNSEC_CHROOT_CHMOD
|
||||
~!GRKERNSEC_CHROOT_CAPS
|
||||
"
|
||||
|
||||
VIRTNET_CONFIG_CHECK="
|
||||
~BRIDGE_NF_EBTABLES
|
||||
~BRIDGE_EBT_MARK_T
|
||||
~NETFILTER_ADVANCED
|
||||
~NETFILTER_XT_TARGET_CHECKSUM
|
||||
~NETFILTER_XT_CONNMARK
|
||||
~NETFILTER_XT_MARK
|
||||
"
|
||||
|
||||
MACVTAP_CONFIG_CHECK=" ~MACVTAP"
|
||||
|
||||
LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup qemu 77
|
||||
enewuser qemu 77 -1 -1 qemu kvm
|
||||
|
||||
# Some people used the masked ebuild which was not adding the qemu
|
||||
# user to the kvm group originally. This results in VMs failing to
|
||||
# start for some users. bug #430808
|
||||
egetent group kvm | grep -q qemu
|
||||
if [[ $? -ne 0 ]]; then
|
||||
gpasswd -a qemu kvm
|
||||
fi
|
||||
|
||||
python-single-r1_pkg_setup
|
||||
|
||||
# Handle specific kernel versions for different features
|
||||
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
|
||||
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
|
||||
|
||||
CONFIG_CHECK=""
|
||||
use fuse && CONFIG_CHECK+=" ~FUSE_FS"
|
||||
use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
|
||||
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
|
||||
use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
|
||||
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
|
||||
if [[ -n ${CONFIG_CHECK} ]]; then
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
touch "${S}/.mailmap"
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
|
||||
# git checkouts require bootstrapping to create the configure script.
|
||||
# Additionally the submodules must be cloned to the right locations
|
||||
# bug #377279
|
||||
./bootstrap || die "bootstrap failed"
|
||||
(
|
||||
git submodule status | sed 's/^[ +-]//;s/ .*//'
|
||||
git hash-object bootstrap.conf
|
||||
) >.git-module-status
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
|
||||
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
|
||||
|
||||
# Tweak the init script
|
||||
local avahi_init=
|
||||
local iscsi_init=
|
||||
local rbd_init=
|
||||
local firewalld_init=
|
||||
cp "${FILESDIR}/libvirtd.init-r12" "${S}/libvirtd.init"
|
||||
use avahi && avahi_init='avahi-daemon'
|
||||
use iscsi && iscsi_init='iscsid'
|
||||
use rbd && rbd_init='ceph'
|
||||
use firewalld && firewalld_init='need firewalld'
|
||||
|
||||
sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=""
|
||||
|
||||
## enable/disable daemon, otherwise client only utils
|
||||
myconf="${myconf} $(use_with libvirtd)"
|
||||
|
||||
## enable/disable the daemon using avahi to find VMs
|
||||
myconf="${myconf} $(use_with avahi)"
|
||||
|
||||
## hypervisors on the local host
|
||||
myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
|
||||
myconf+=" --without-xenapi"
|
||||
if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
|
||||
myconf+=" --with-libxl"
|
||||
else
|
||||
myconf+=" --without-libxl"
|
||||
fi
|
||||
myconf="${myconf} $(use_with openvz)"
|
||||
myconf="${myconf} $(use_with lxc)"
|
||||
if use virtualbox && has_version app-emulation/virtualbox-ose; then
|
||||
myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
|
||||
else
|
||||
myconf="${myconf} $(use_with virtualbox vbox)"
|
||||
fi
|
||||
myconf="${myconf} $(use_with uml)"
|
||||
myconf="${myconf} $(use_with qemu)"
|
||||
myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
|
||||
myconf="${myconf} $(use_with phyp)"
|
||||
myconf="${myconf} --with-esx"
|
||||
myconf="${myconf} --with-vmware"
|
||||
|
||||
## additional host drivers
|
||||
myconf="${myconf} $(use_with virt-network network)"
|
||||
myconf="${myconf} --with-storage-fs"
|
||||
myconf="${myconf} $(use_with lvm storage-lvm)"
|
||||
myconf="${myconf} $(use_with iscsi storage-iscsi)"
|
||||
myconf="${myconf} $(use_with parted storage-disk)"
|
||||
myconf="${myconf} $(use_with lvm storage-mpath)"
|
||||
myconf="${myconf} $(use_with rbd storage-rbd)"
|
||||
myconf="${myconf} $(use_with numa numactl)"
|
||||
myconf="${myconf} $(use_with numa numad)"
|
||||
myconf="${myconf} $(use_with selinux)"
|
||||
myconf="${myconf} $(use_with fuse)"
|
||||
|
||||
# udev for device support details
|
||||
myconf="${myconf} $(use_with udev)"
|
||||
|
||||
# linux capability support so we don't need privileged accounts
|
||||
myconf="${myconf} $(use_with caps capng)"
|
||||
|
||||
## auth stuff
|
||||
myconf="${myconf} $(use_with policykit polkit)"
|
||||
myconf="${myconf} $(use_with sasl)"
|
||||
|
||||
# network bits
|
||||
myconf="${myconf} $(use_with macvtap)"
|
||||
myconf="${myconf} $(use_with pcap libpcap)"
|
||||
myconf="${myconf} $(use_with vepa virtualport)"
|
||||
myconf="${myconf} $(use_with firewalld)"
|
||||
|
||||
## other
|
||||
myconf="${myconf} $(use_enable nls)"
|
||||
myconf="${myconf} $(use_with python)"
|
||||
|
||||
# user privilege bits fir qemu/kvm
|
||||
if use caps; then
|
||||
myconf="${myconf} --with-qemu-user=qemu"
|
||||
myconf="${myconf} --with-qemu-group=qemu"
|
||||
else
|
||||
myconf="${myconf} --with-qemu-user=root"
|
||||
myconf="${myconf} --with-qemu-group=root"
|
||||
fi
|
||||
|
||||
# audit support
|
||||
myconf="${myconf} $(use_with audit)"
|
||||
|
||||
## stuff we don't yet support
|
||||
myconf="${myconf} --without-netcf"
|
||||
|
||||
# we use udev over hal
|
||||
myconf="${myconf} --without-hal"
|
||||
|
||||
# locking support
|
||||
myconf="${myconf} --without-sanlock"
|
||||
|
||||
# systemd unit files
|
||||
use systemd && myconf="${myconf} --with-init-script=systemd"
|
||||
|
||||
# this is a nasty trick to work around the problem in bug
|
||||
# #275073. The reason why we don't solve this properly is that
|
||||
# it'll require us to rebuild autotools (and we don't really want
|
||||
# to do that right now). The proper solution has been sent
|
||||
# upstream and should hopefully land in 0.7.7, in the mean time,
|
||||
# mime the same functionality with this.
|
||||
case ${CHOST} in
|
||||
*cygwin* | *mingw* )
|
||||
;;
|
||||
*)
|
||||
ac_cv_prog_WINDRES=no
|
||||
;;
|
||||
esac
|
||||
|
||||
econf \
|
||||
${myconf} \
|
||||
--disable-static \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--with-remote \
|
||||
--localstatedir=/var
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Restore gnulib's config.sub and config.guess
|
||||
# bug #377279
|
||||
(cd .gnulib && git reset --hard > /dev/null)
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Explicitly allow parallel build of tests
|
||||
export VIR_TEST_DEBUG=1
|
||||
HOME="${T}" emake check || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install \
|
||||
DESTDIR="${D}" \
|
||||
HTML_DIR=/usr/share/doc/${PF}/html \
|
||||
DOCS_DIR=/usr/share/doc/${PF} \
|
||||
EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
|
||||
SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
|
||||
|| die "emake install failed"
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
newinitd "${S}/libvirtd.init" libvirtd || die
|
||||
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
|
||||
|
||||
keepdir /var/lib/libvirt/images
|
||||
|
||||
use python && python_optimize
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# we only ever want to generate this once
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
# We really don't want to use or support old PolicyKit cause it
|
||||
# screws with the new polkit integration
|
||||
if has_version sys-auth/policykit; then
|
||||
rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
|
||||
fi
|
||||
|
||||
# Only sysctl files ending in .conf work
|
||||
dodir /etc/sysctl.d
|
||||
mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
# support for dropped privileges
|
||||
if use qemu; then
|
||||
fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
|
||||
fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
|
||||
fi
|
||||
|
||||
if use caps && use qemu; then
|
||||
fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
|
||||
fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
|
||||
elif use qemu; then
|
||||
fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
|
||||
fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
|
||||
fi
|
||||
|
||||
if ! use policykit; then
|
||||
elog "To allow normal users to connect to libvirtd you must change the"
|
||||
elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
|
||||
fi
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use caps && use qemu; then
|
||||
elog "libvirt will now start qemu/kvm VMs with non-root privileges."
|
||||
elog "Ensure any resources your VMs use are accessible by qemu:qemu"
|
||||
fi
|
||||
}
|
||||
@ -1,432 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3.ebuild,v 1.3 2013/10/13 10:32:11 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
BACKPORTS=e3fb8465
|
||||
AUTOTOOLIZE=yes
|
||||
|
||||
MY_P="${P/_rc/-rc}"
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-2
|
||||
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
|
||||
AUTOTOOLIZE=yes
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
|
||||
ftp://libvirt.org/libvirt/${MY_P}.tar.gz
|
||||
${BACKPORTS:+
|
||||
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="amd64 x86"
|
||||
fi
|
||||
S="${WORKDIR}/${P%_rc*}"
|
||||
|
||||
DESCRIPTION="C toolkit to manipulate virtual machines"
|
||||
HOMEPAGE="http://www.libvirt.org/"
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
|
||||
nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
|
||||
selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
|
||||
systemd"
|
||||
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
|
||||
lxc? ( caps libvirtd )
|
||||
openvz? ( libvirtd )
|
||||
qemu? ( libvirtd )
|
||||
uml? ( libvirtd )
|
||||
vepa? ( macvtap )
|
||||
virtualbox? ( libvirtd )
|
||||
xen? ( libvirtd )
|
||||
virt-network? ( libvirtd )
|
||||
firewalld? ( virt-network )
|
||||
python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
# gettext.sh command is used by the libvirt command wrappers, and it's
|
||||
# non-optional, so put it into RDEPEND.
|
||||
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
|
||||
# package will use 3 by default. Since we don't have slot pinning in an API,
|
||||
# we must go with the most recent
|
||||
RDEPEND="sys-libs/readline
|
||||
sys-libs/ncurses
|
||||
>=net-misc/curl-7.18.0
|
||||
dev-libs/libgcrypt
|
||||
>=dev-libs/libxml2-2.7.6
|
||||
dev-libs/libnl:3
|
||||
>=net-libs/gnutls-1.0.25
|
||||
net-libs/libssh2
|
||||
sys-apps/dmidecode
|
||||
>=sys-apps/util-linux-2.17
|
||||
sys-devel/gettext
|
||||
>=net-analyzer/netcat6-1.0-r2
|
||||
app-misc/scrub
|
||||
audit? ( sys-process/audit )
|
||||
avahi? ( >=net-dns/avahi-0.6[dbus] )
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
fuse? ( >=sys-fs/fuse-2.8.6 )
|
||||
iscsi? ( sys-block/open-iscsi )
|
||||
lxc? ( sys-power/pm-utils )
|
||||
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
|
||||
nfs? ( net-fs/nfs-utils )
|
||||
numa? (
|
||||
>sys-process/numactl-2.0.2
|
||||
sys-process/numad
|
||||
)
|
||||
openvz? ( sys-kernel/openvz-sources )
|
||||
parted? (
|
||||
>=sys-block/parted-1.8[device-mapper]
|
||||
sys-fs/lvm2
|
||||
)
|
||||
pcap? ( >=net-libs/libpcap-1.0.0 )
|
||||
policykit? ( >=sys-auth/polkit-0.9 )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qemu? (
|
||||
>=app-emulation/qemu-0.13.0
|
||||
dev-libs/yajl
|
||||
sys-power/pm-utils
|
||||
)
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.85 )
|
||||
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
|
||||
xen? ( app-emulation/xen-tools app-emulation/xen )
|
||||
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
|
||||
virt-network? ( net-dns/dnsmasq
|
||||
>=net-firewall/iptables-1.4.10
|
||||
net-misc/radvd
|
||||
net-firewall/ebtables
|
||||
sys-apps/iproute2[-minimal]
|
||||
firewalld? ( net-firewall/firewalld )
|
||||
)
|
||||
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
|
||||
# one? ( dev-libs/xmlrpc-c )
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
app-text/xhtml1
|
||||
dev-lang/perl
|
||||
dev-libs/libxslt"
|
||||
|
||||
DOC_CONTENTS="For the basic networking support (bridged and routed networks)
|
||||
you don't need any extra software. For more complex network modes
|
||||
including but not limited to NATed network, you can enable the
|
||||
'virt-network' USE flag.\n\n
|
||||
If you are using dnsmasq on your system, you will have
|
||||
to configure /etc/dnsmasq.conf to enable the following settings:\n\n
|
||||
bind-interfaces\n
|
||||
interface or except-interface\n\n
|
||||
Otherwise you might have issues with your existing DNS server."
|
||||
|
||||
LXC_CONFIG_CHECK="
|
||||
~CGROUPS
|
||||
~CGROUP_FREEZER
|
||||
~CGROUP_DEVICE
|
||||
~CGROUP_CPUACCT
|
||||
~CGROUP_SCHED
|
||||
~CGROUP_PERF
|
||||
~BLK_CGROUP
|
||||
~NET_CLS_CGROUP
|
||||
~NETPRIO_CGROUP
|
||||
~CPUSETS
|
||||
~RESOURCE_COUNTERS
|
||||
~NAMESPACES
|
||||
~UTS_NS
|
||||
~IPC_NS
|
||||
~PID_NS
|
||||
~NET_NS
|
||||
~USER_NS
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
~VETH
|
||||
~MACVLAN
|
||||
~POSIX_MQUEUE
|
||||
~SECURITYFS
|
||||
~!GRKERNSEC_CHROOT_MOUNT
|
||||
~!GRKERNSEC_CHROOT_DOUBLE
|
||||
~!GRKERNSEC_CHROOT_PIVOT
|
||||
~!GRKERNSEC_CHROOT_CHMOD
|
||||
~!GRKERNSEC_CHROOT_CAPS
|
||||
"
|
||||
|
||||
VIRTNET_CONFIG_CHECK="
|
||||
~BRIDGE_NF_EBTABLES
|
||||
~BRIDGE_EBT_MARK_T
|
||||
~NETFILTER_ADVANCED
|
||||
~NETFILTER_XT_TARGET_CHECKSUM
|
||||
~NETFILTER_XT_CONNMARK
|
||||
~NETFILTER_XT_MARK
|
||||
"
|
||||
|
||||
MACVTAP_CONFIG_CHECK=" ~MACVTAP"
|
||||
|
||||
LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup qemu 77
|
||||
enewuser qemu 77 -1 -1 qemu kvm
|
||||
|
||||
# Some people used the masked ebuild which was not adding the qemu
|
||||
# user to the kvm group originally. This results in VMs failing to
|
||||
# start for some users. bug #430808
|
||||
egetent group kvm | grep -q qemu
|
||||
if [[ $? -ne 0 ]]; then
|
||||
gpasswd -a qemu kvm
|
||||
fi
|
||||
|
||||
python-single-r1_pkg_setup
|
||||
|
||||
# Handle specific kernel versions for different features
|
||||
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
|
||||
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
|
||||
|
||||
CONFIG_CHECK=""
|
||||
use fuse && CONFIG_CHECK+=" ~FUSE_FS"
|
||||
use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
|
||||
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
|
||||
use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
|
||||
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
|
||||
if [[ -n ${CONFIG_CHECK} ]]; then
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
touch "${S}/.mailmap"
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
|
||||
# git checkouts require bootstrapping to create the configure script.
|
||||
# Additionally the submodules must be cloned to the right locations
|
||||
# bug #377279
|
||||
./bootstrap || die "bootstrap failed"
|
||||
(
|
||||
git submodule status | sed 's/^[ +-]//;s/ .*//'
|
||||
git hash-object bootstrap.conf
|
||||
) >.git-module-status
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
|
||||
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
|
||||
|
||||
# Tweak the init script
|
||||
local avahi_init=
|
||||
local iscsi_init=
|
||||
local rbd_init=
|
||||
local firewalld_init=
|
||||
cp "${FILESDIR}/libvirtd.init-r12" "${S}/libvirtd.init"
|
||||
use avahi && avahi_init='avahi-daemon'
|
||||
use iscsi && iscsi_init='iscsid'
|
||||
use rbd && rbd_init='ceph'
|
||||
use firewalld && firewalld_init='need firewalld'
|
||||
|
||||
sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=""
|
||||
|
||||
## enable/disable daemon, otherwise client only utils
|
||||
myconf="${myconf} $(use_with libvirtd)"
|
||||
|
||||
## enable/disable the daemon using avahi to find VMs
|
||||
myconf="${myconf} $(use_with avahi)"
|
||||
|
||||
## hypervisors on the local host
|
||||
myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
|
||||
myconf+=" --without-xenapi"
|
||||
if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
|
||||
myconf+=" --with-libxl"
|
||||
else
|
||||
myconf+=" --without-libxl"
|
||||
fi
|
||||
myconf="${myconf} $(use_with openvz)"
|
||||
myconf="${myconf} $(use_with lxc)"
|
||||
if use virtualbox && has_version app-emulation/virtualbox-ose; then
|
||||
myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
|
||||
else
|
||||
myconf="${myconf} $(use_with virtualbox vbox)"
|
||||
fi
|
||||
myconf="${myconf} $(use_with uml)"
|
||||
myconf="${myconf} $(use_with qemu)"
|
||||
myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
|
||||
myconf="${myconf} $(use_with phyp)"
|
||||
myconf="${myconf} --with-esx"
|
||||
myconf="${myconf} --with-vmware"
|
||||
|
||||
## additional host drivers
|
||||
myconf="${myconf} $(use_with virt-network network)"
|
||||
myconf="${myconf} --with-storage-fs"
|
||||
myconf="${myconf} $(use_with lvm storage-lvm)"
|
||||
myconf="${myconf} $(use_with iscsi storage-iscsi)"
|
||||
myconf="${myconf} $(use_with parted storage-disk)"
|
||||
myconf="${myconf} $(use_with lvm storage-mpath)"
|
||||
myconf="${myconf} $(use_with rbd storage-rbd)"
|
||||
myconf="${myconf} $(use_with numa numactl)"
|
||||
myconf="${myconf} $(use_with numa numad)"
|
||||
myconf="${myconf} $(use_with selinux)"
|
||||
myconf="${myconf} $(use_with fuse)"
|
||||
|
||||
# udev for device support details
|
||||
myconf="${myconf} $(use_with udev)"
|
||||
|
||||
# linux capability support so we don't need privileged accounts
|
||||
myconf="${myconf} $(use_with caps capng)"
|
||||
|
||||
## auth stuff
|
||||
myconf="${myconf} $(use_with policykit polkit)"
|
||||
myconf="${myconf} $(use_with sasl)"
|
||||
|
||||
# network bits
|
||||
myconf="${myconf} $(use_with macvtap)"
|
||||
myconf="${myconf} $(use_with pcap libpcap)"
|
||||
myconf="${myconf} $(use_with vepa virtualport)"
|
||||
myconf="${myconf} $(use_with firewalld)"
|
||||
|
||||
## other
|
||||
myconf="${myconf} $(use_enable nls)"
|
||||
myconf="${myconf} $(use_with python)"
|
||||
|
||||
# user privilege bits fir qemu/kvm
|
||||
if use caps; then
|
||||
myconf="${myconf} --with-qemu-user=qemu"
|
||||
myconf="${myconf} --with-qemu-group=qemu"
|
||||
else
|
||||
myconf="${myconf} --with-qemu-user=root"
|
||||
myconf="${myconf} --with-qemu-group=root"
|
||||
fi
|
||||
|
||||
# audit support
|
||||
myconf="${myconf} $(use_with audit)"
|
||||
|
||||
## stuff we don't yet support
|
||||
myconf="${myconf} --without-netcf"
|
||||
|
||||
# we use udev over hal
|
||||
myconf="${myconf} --without-hal"
|
||||
|
||||
# locking support
|
||||
myconf="${myconf} --without-sanlock"
|
||||
|
||||
# systemd unit files
|
||||
use systemd && myconf="${myconf} --with-init-script=systemd"
|
||||
|
||||
# this is a nasty trick to work around the problem in bug
|
||||
# #275073. The reason why we don't solve this properly is that
|
||||
# it'll require us to rebuild autotools (and we don't really want
|
||||
# to do that right now). The proper solution has been sent
|
||||
# upstream and should hopefully land in 0.7.7, in the mean time,
|
||||
# mime the same functionality with this.
|
||||
case ${CHOST} in
|
||||
*cygwin* | *mingw* )
|
||||
;;
|
||||
*)
|
||||
ac_cv_prog_WINDRES=no
|
||||
;;
|
||||
esac
|
||||
|
||||
econf \
|
||||
${myconf} \
|
||||
--disable-static \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--with-remote \
|
||||
--localstatedir=/var
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Restore gnulib's config.sub and config.guess
|
||||
# bug #377279
|
||||
(cd .gnulib && git reset --hard > /dev/null)
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Explicitly allow parallel build of tests
|
||||
export VIR_TEST_DEBUG=1
|
||||
HOME="${T}" emake check || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install \
|
||||
DESTDIR="${D}" \
|
||||
HTML_DIR=/usr/share/doc/${PF}/html \
|
||||
DOCS_DIR=/usr/share/doc/${PF} \
|
||||
EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
|
||||
SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
|
||||
|| die "emake install failed"
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
newinitd "${S}/libvirtd.init" libvirtd || die
|
||||
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
|
||||
|
||||
keepdir /var/lib/libvirt/images
|
||||
|
||||
use python && python_optimize
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# we only ever want to generate this once
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
# We really don't want to use or support old PolicyKit cause it
|
||||
# screws with the new polkit integration
|
||||
if has_version sys-auth/policykit; then
|
||||
rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
|
||||
fi
|
||||
|
||||
# Only sysctl files ending in .conf work
|
||||
dodir /etc/sysctl.d
|
||||
mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
# support for dropped privileges
|
||||
if use qemu; then
|
||||
fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
|
||||
fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
|
||||
fi
|
||||
|
||||
if use caps && use qemu; then
|
||||
fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
|
||||
fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
|
||||
elif use qemu; then
|
||||
fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
|
||||
fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
|
||||
fi
|
||||
|
||||
if ! use policykit; then
|
||||
elog "To allow normal users to connect to libvirtd you must change the"
|
||||
elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
|
||||
fi
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use caps && use qemu; then
|
||||
elog "libvirt will now start qemu/kvm VMs with non-root privileges."
|
||||
elog "Ensure any resources your VMs use are accessible by qemu:qemu"
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST lynis-1.3.0.tar.gz 119797 SHA256 fe265965eb1ce8fac352e0bddea1d5ec6508c319bf88a5f63c2edecf2af6de54 SHA512 a2cf40fbc245e9ed89740026374f3b61110cc1e0282899284699a2271cb4996f30d0a91562d3e2eaf5eb165ab89d0860127ceeb5767aec1d5538b879657a76a8 WHIRLPOOL c19aaaf2f9ccd8141a86b1eeecf129ab83006b50ed428eb1801b58811b441f3c5cfea37d1333cf58fd372b3f40026735bdc2e44ace3de399a27e2e0dd8300fa3
|
||||
DIST lynis-1.3.1.tar.gz 131573 SHA256 10532b626e8182605e3ca9215d856a20145f776c30c729387f374dd753230a15 SHA512 8f4c9d0e829ad885d112506606674418dd57085b9e05769d66e07a3f6ca6f6a6fbd066950bc2315a629f7adaff5b2cff89d58ea7aa4df30d090f7ac92012c18c WHIRLPOOL f6bf49e1b327235fe4a3ed21232adbb741d88033c6626171810800f62f525e05c0ebcd6df939a2701ee78e3d4ab5dbe9af971d81d75c8d01c458c898b77a6fdb
|
||||
DIST lynis-1.3.2.tar.gz 133009 SHA256 0f6e0b893c026f7910bc0db7ddbed222e2b0e6cb5463b106ef53e5ceb7b3cb3f SHA512 0704494a3bf3fe80435b66129ec5fed23383223d583c9685997f8d5fcb692db3d724320adcb5534c9b79fad697b6119faa4bba79e119623acc2862cc4c588411 WHIRLPOOL 66ed52818ec8f9ee5668bcd91714f91ea73ea1f2b539768207fa58d52554e7a214a74d0a7a077a335b4dc5494f70793d9bf6ba7163de5f0bef534289af568f0d
|
||||
DIST lynis-1.3.3.tar.gz 133463 SHA256 7389dff4435dbb31612ceb1a4260cfd7383ed58182a216b128d8e1cfd34118f7 SHA512 7584d076e680aa55a7b75fc740993deadf7778be57f1ae93b8cfc3d4981b7a5e7ca3fbe28e84b808e3607ecc802a2e42a622d63d66c4b497cd829dff50458e1b WHIRLPOOL 48c87002bfc9edb2d281f310647009a727e232a5df653e4b92dd03cc64623edf23a6c848158885db76bb3bd6234b591e11e7e651e66fb613b23e715440694ff8
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.3.2.ebuild,v 1.1 2013/10/10 18:34:27 idl0r Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
DESCRIPTION="Security and system auditing tool"
|
||||
HOMEPAGE="http://www.rootkit.nl/projects/lynis.html"
|
||||
SRC_URI="http://www.rootkit.nl/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="app-shells/bash"
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/${PN}
|
||||
doins -r db/ include/ plugins/ || die "failed to install lynis base files"
|
||||
|
||||
dosbin lynis
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins default.prf
|
||||
|
||||
doman lynis.8
|
||||
dodoc CHANGELOG FAQ README dev/TODO
|
||||
|
||||
# Remove the old one during the next stabilize progress
|
||||
exeinto /etc/cron.daily
|
||||
newexe "${FILESDIR}"/lynis.cron-new lynis
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo
|
||||
einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
|
||||
einfo
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.3.1.ebuild,v 1.1 2013/10/03 13:41:48 idl0r Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.3.3.ebuild,v 1.1 2013/10/25 18:02:46 idl0r Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
@ -1,12 +1,24 @@
|
||||
DIST amd64-debug-libreoffice-base-4.0.4.2.tar.xz 834170168 SHA256 be688e57f6d90e0a1481e6172ee718ea2ea18235534e17bfa8aa3eb938a76f70 SHA512 cc42f32aa0cb02b43bc3e07ef6543e033ca737b7acdf87624ef61facc72682a4cd37610d9ade5357f570129628eef7083a479fcd7e5cb74aff32c7d7f007278b WHIRLPOOL 10c385ccfd6e510df8b45f3ce4eb0aa075f125f388946eefa2c5522a8498b9d3effbe3f3a5f49df539226b818fdeefab9db87f9f43ed6f9fee1c203b835a3f23
|
||||
DIST amd64-debug-libreoffice-base-4.1.2.3.tar.xz 958196788 SHA256 8a1d3cd528aed0522bd1a582270d97d21b64352134af0f9b87d8c01ae1eeba9a SHA512 50bbd6dffc25ad6197cf9ef1acf5f198cb8c75f8ba5b81032429c52b7a2565ae1eb0c60faf30318ede00fe5e3ac03b39632f81304e8bcfac76f99059d5a39067 WHIRLPOOL 95c0da2db2df6ab81f807c2d456da01f5602bd6057fa2f71407b3eae44a246c0e91963312efad06f84d36bb2d30418e4fd693a23e385e4bf818268cbbdd3d3bb
|
||||
DIST amd64-debug-libreoffice-base-java-4.0.4.2.tar.xz 838854628 SHA256 1608f2d7841707c8fc787121407d86eee271f70b0eec9234cac275640f74cb33 SHA512 755b3acdbf49b0735aea16a7750001929fe45ce757522426003b0fea2a6e6525f539c5450d69974f5dc315c235bc73eaa2ec997b7b99d31a14f15936175ec2fe WHIRLPOOL 457f0d1c96ca7459a89e213ca9fa4530a9140eb1de1d2872e360588f423ad8ce9caeb758ff22e1795976c32b53fa163fa76b3a66db06ff911949b164d718981d
|
||||
DIST amd64-debug-libreoffice-base-java-4.1.2.3.tar.xz 963983160 SHA256 ae51aa73737f1e9eb40dc51f3b27a96eeff94fa04f5a02894d1db613d6b5e31b SHA512 686fb5da30963c191d6b37eca1b4f501128737cbc62250a1bde776c45678c99efcdf296773d979e0fdc49109f7efaf2480c23da6fd99838c9021fa04e37f348f WHIRLPOOL 6360b03344ee9dec343cbaffa06f712563eb9121df88af03a6642fdd60a6d8d55ee3a757dda153b1c010e535aa97b10d56e5edff3f1bb1fe44bdfcf5efbba905
|
||||
DIST amd64-debug-libreoffice-gnome-4.0.4.2.tar.xz 836135384 SHA256 a610f8d75b36177b44cd02a3cf87a1f0adfd7da3ecb78ba1c97ed72194212b27 SHA512 df136a30fb5a8cedf98764d7a90c893ce3becf7e33efaedfa6dca91cd81142a2bb395225d7acf3e0f4a1ff46d1bc1650b488cd1f18cfca516676a0776499c9aa WHIRLPOOL e5738ec60ec174ec8b6e367c724b72e3549567df3904427a7046ac4d5359af79f146d0d4d93cc5e4839c362821d5be646b81328aff763bf245452bad03d7b808
|
||||
DIST amd64-debug-libreoffice-gnome-4.1.2.3.tar.xz 960147772 SHA256 411a0a1e4d3ddfa97cc36cd062d68b349bb7c008e03535f1fa83f2cec395a96e SHA512 510d2a9b067421ef7a1f8ae6b9eaf8584d8ab10665e279f73f3c99b7950de2a1c4b987add9317ed64581cbd3adb55245f2bfd47726403a435b5a0fc523427b99 WHIRLPOOL 4b1f83814ff95762089efc97a3fbe0b94c69f469148437668775c22bae7f843ed93cedbdf8eb19fe33facd10d33b06623fc50d0e086c44cf6cef7ce94dd9a3ac
|
||||
DIST amd64-debug-libreoffice-gnome-java-4.0.4.2.tar.xz 840819452 SHA256 6d22a7e0a50a16609969bf2bc7345a50326b0429990b3b4d1a9ab906935ac47a SHA512 4ada558bbc4f4411988658ae8b857ef265a6ccb73caa64e15807bd9dcb58b561b68109b834897fd6b137a5a2727244a3d944fc6c7883eb483ec30f585637800a WHIRLPOOL 786633cf13b48130bbcbce44d0843391dea21949339044b4d99db690f199292f6214b5301a731d061b1186a9c33b38f3b9b7cf27caa758543e75bbd1d2e1b554
|
||||
DIST amd64-debug-libreoffice-gnome-java-4.1.2.3.tar.xz 965971704 SHA256 c3a5a3c7719877c9aff53e4cb35ea9d719687fd7a08f5d7973035050ee5f49b3 SHA512 10bb93e3e19d35595fe8ccf54b709c94f0cdab98a168bfd99b5cf4c4ced8e2d816697ac10e4e7f7f6fef6c02513c179ee57342d1f300b040e562e9bb0a8dc219 WHIRLPOOL c2cd2d696497f780f40cf9035a454774c6084a83b9bf7dd313d840b1cc66b86cf2fe639e41e507b43d6b409a8cfd736bb907e6bef66519cca6b64983d1733487
|
||||
DIST amd64-debug-libreoffice-kde-4.0.4.2.tar.xz 835447712 SHA256 044913d9ea73a5458ec6f1b1300747d7b869a1e37ce1177516cac570327d8962 SHA512 f715285e267ff11f430a568ac3528465759dc92098e05529f2ee2e6c4ef542d9a9e9290ae86d33e0790b2a6fff35712d6226d3f848f805cb16a142f6476cd636 WHIRLPOOL 8ce4f9d584a0c535ae8c7d2645b3bb65cd024d0d771a8e6b05eb896e8068a993c213e2bca7cf5f9fdb62c6d99b3478b6793d233ec9b0ecdaf4e07c55244687f0
|
||||
DIST amd64-debug-libreoffice-kde-4.1.2.3.tar.xz 959761312 SHA256 d122dc7f67cc52dc5481b1ff65d04b4f77bf6a6a46b8006f4d409355ed385710 SHA512 3fbcea6f97cdca65e915060d87ad50d1571d8e0860d26a022e40d9e8e95a473b2e34351360de5470bb58e83c61f819013485040e93ce982e0e11ba1ff84b75b6 WHIRLPOOL af22c04b0373dd3fdfc1c7105100717c8c9f2827c53326cc4b80dc1c6a4ec1f6b7293437395c623c71ce1a2bab4e31653ae524093f66fb6eb6a01bd3321f7835
|
||||
DIST amd64-debug-libreoffice-kde-java-4.0.4.2.tar.xz 840102712 SHA256 4bd3fa856e488516a1e8a47cfbf0a958115892628d6c3b85b0645fb03f2fb05a SHA512 4c86b4fb83a30b0234f1f014f609b3f336880cb6280ac5a7f73f5fcb1100c028032114bde037e627f0055aff4918046659ad5771b6f0b896e7bf52771215f09a WHIRLPOOL cd3a845f04b29fa4dc7c2e87fd70d7843e70b777df2646f6a17746792d89bee8b1ef1dd1afa55d5cbd82e0528e1c32c6be788f82dc57bf5f7751091387be5926
|
||||
DIST amd64-debug-libreoffice-kde-java-4.1.2.3.tar.xz 965557164 SHA256 146509c8738f3a256505016b1ac8951733b488a789f86d5aa8a2f864aca9295c SHA512 4988537aead15952f7b75ec6ef6dc63a10d39e88c597d68c8ba071bd56195b6207534e402c1837b7e590a161d580b66d475385fa9a0f25b5734a3c35865a712d WHIRLPOOL da3e5e5ee00f4b1c8eeb2c813d2e0613ed8317bf4de1b193f9032ad348bde1a62e33dbcdaef10a160e4cc9391df7aadbf7981ee54272ef9c132c0c1d42b0529e
|
||||
DIST x86-debug-libreoffice-base-4.0.4.2.tar.xz 782822812 SHA256 8d738a4dd8ddaf902893eacb0206b49e3ed1c664f705dad834969e4636120de7 SHA512 dfba4e2904281157e622e43343fdbe81421d7dc8995c5c889a259cdb5c864d7691e48fb33d3b584f549a882cb2cf1fd7dba83e27db943a5e873f53d79677333d WHIRLPOOL c1814ba6b03f2254b83cac7379d0cdd970c6f32a305e22e2cfffe4a64a052500dcef8fd911f8b5f025f0de892fb843a1ad131aabe714738db321473dffa11ccd
|
||||
DIST x86-debug-libreoffice-base-4.1.2.3.tar.xz 891947864 SHA256 bd6f0c14cda4d37339a451596407ce3e65718a6b0cba45e48cae761d97284a5d SHA512 9905c84e14c41bb1a8e6d54d8ec5a3c1ad9aa0d57ebd11c8c69e401246693121b0ced85cceb263bedfcf067271b619d5c2e971eba9121774fae1968cfba6f095 WHIRLPOOL 7564e261c6e5ece378bac2b211d4706bb3b2e6a696c84559e022869c3d5e3742727abce8601e6506e066bafd03f2914cc9d41c5ebdecb12e3a5a92157ee18c46
|
||||
DIST x86-debug-libreoffice-base-java-4.0.4.2.tar.xz 787096064 SHA256 04934932f65735398640cf3a4ad1b11ab33afa3769a0d038ff00727ef6802912 SHA512 163fd7df816c9dfb3cb49d8aef01076123adb913489d8ca632107d658b94b04df5c18b18dd3cc9a95353d797b26f534ab06afbbdc965e1a0aefbd21cc22c8058 WHIRLPOOL bc7f48a98aba797a5d7043befa764c598e8a4b54a6f49df63ea43ccba6ed91cd1380f79eaa71fd3126c708ff83fb56789d04e83587a6acc43fdce5104b6b0cbc
|
||||
DIST x86-debug-libreoffice-base-java-4.1.2.3.tar.xz 897133180 SHA256 b0f0c22ef6541a02fdcd1d0f289a980b3e599ffa9d2b1f40278b23727510fc36 SHA512 de817d5c967e9b3ef217d51551e4d3cf8a67cf509ec0c12ee0338f7170cdfd158b6fabe666f508991d68ae30aa0d2da16619ebc3780464ae130b42ccfce95662 WHIRLPOOL 5859ac7394ed03fd7d618ffb3bc5f5217c6a9f481a2c44ebc4d409c22a427814fe9c788dba9ff8e6f10222b06a706a31012fd8c4d3d2a30ac5aa8085c45bb878
|
||||
DIST x86-debug-libreoffice-gnome-4.0.4.2.tar.xz 784681768 SHA256 58ac1eba1d7d15c254c212e176050d9d11cb6427289d7efca6cc4bf234f5f040 SHA512 5ad80acf841703c256029408ca276dcf9d623f2c6f0606898ffbf982eb299257dc6a5a57838d5356f3fc86094a90dd79194a80a509db6b71569a9fab3f3203e0 WHIRLPOOL 0ff569f6458154a3be5d6c3e2dd589c9b84febf393ddfa409c72c86932c2352b918c83d004daf084549150d7b6df9214ea863861700acefe10c29c0ab33fe379
|
||||
DIST x86-debug-libreoffice-gnome-4.1.2.3.tar.xz 893806224 SHA256 d7654df90f34555954718371eb166b07ab303963c23453ac7f55dc6fd88cd3ce SHA512 5d23bee6e6d94ab67600659ba05aa8bd577ce31036df1d9d9c655edda6f58acdc799594878981ed8d2d54617c85cc5deb58c9c88897c4056dfe0a6494a669921 WHIRLPOOL 4a55f4c5669607bc4c749560144fb0d77fd3e6d35e74d5618371331e23e4657e70e872e4092cad06f9db705dc325c2e7a3eb02dce1f363d85d8835af455fa558
|
||||
DIST x86-debug-libreoffice-gnome-java-4.0.4.2.tar.xz 788944208 SHA256 40c7efdfbf6170b9ff13cfa799457a42bbd7c263ea67f5cd043d19a27933cd2f SHA512 63b713d773443f28ae26e1bb704a21ec50138aaf323b113b5377faa91f8b197f6e315eb3fe94cceaffdd181c13fd9d3f621e61bf71bd9d359fc3387f2ffd9793 WHIRLPOOL 3f3c32b09f8bc8362776625d20622cc043282a585def759b81121e8ad57ef0cdc2f837f1d3b610f24f1b9c0a005bdc73a2c4962a2de255fa7f17c29b150c03d9
|
||||
DIST x86-debug-libreoffice-gnome-java-4.1.2.3.tar.xz 898970136 SHA256 08651668092a6216b2288d4b1d742e7049daf48eed5621c05b84351d13b395ae SHA512 23636dc6ac4ec6275501f9f78344fcae180cd2f6dc7fae7a942de698fe230c94a9d55fe31f290136bb1b9735dc6def11eec77fad17f0ae024723ea0c5a429f85 WHIRLPOOL bf04dc71cf650ccdc19f3934e89a089182f4a75c97a1db815735602971df41c1f3b91723a7991110ae90ac680649484de2100d1fbe0811555f9ad72c80ef021b
|
||||
DIST x86-debug-libreoffice-kde-4.0.4.2.tar.xz 784067860 SHA256 809b67a5dfa880e94595e9f9794be406b71617de23e5f628c4da02bf9d97e090 SHA512 a1e9b1937de21e51a9540512a9d00e982a13444e0f7ae00586ab06c8deb1cec4f2ca5b938d86c6c224d58a8b3b752984a91ec4d62fea1766cd810516b22da014 WHIRLPOOL ac3e09abcd7f81bc5bf24d85c902e616508f495f2df3861224c0a97176076a8b099758a80b22554886bbd0ed20aee6b3145fcf1e00dea6071ab2a6b3309b6700
|
||||
DIST x86-debug-libreoffice-kde-4.1.2.3.tar.xz 893383540 SHA256 e81b0679f256c4ce643fc7e5193939834253f6aad9e5764c7649bafbb7222ee5 SHA512 c45cf60817cd49c16a93863e42608c818639f23531593144392488cd03dd7ad6bef3dd3d5b576c1aefb6e61b49efcf12312d6154751babf21a936fe4066bd7fe WHIRLPOOL 320e8b8137f1c068f4e9281627a9907918d5a774aa6f7a19d9bb04d25429fd322eedcf3f6f153ceb2a284ef04985af5116faa2bb12779e9a31c1a5e659f69320
|
||||
DIST x86-debug-libreoffice-kde-java-4.0.4.2.tar.xz 788317636 SHA256 9a1f7458597ff559263dada46b5d8e22c4df06f816e1916a46a2f7d011bc343a SHA512 2e448143d3f20388473041057255c1dbcb70b0e30cb33f0c78c69d4f5e87d36565cd42c373ad1f241cea7dccc9a3d8230058b3cb38fda1e6218d4bb5a78448c0 WHIRLPOOL 7e3c462df097e0aa7d493233be7383ca04be9abdbc05d9c9f9236dabd6d535dad92875505e7645a5d2ad7ca87ca3d6a90a4510919e2e080652957f28a63bf980
|
||||
DIST x86-debug-libreoffice-kde-java-4.1.2.3.tar.xz 898585060 SHA256 724912cf06d9bf11b22bdc40d11acb44c36370b6d557db6ff732cbce2a165a88 SHA512 1334e8958e1d67974735259815dfe00646abd54e4c6dd5144a46c68f8787270006fe4fdb504b465fa76435700ea40a7e96703c7644cad2b7bcf1b47335366684 WHIRLPOOL 94dbeb85cd717ed562c5523e5982068a31cd4ae0efd25e73fc9c2631366bc27380caf126fded524072835bc7652924814154255745d470be4dcb7ce16acf5a1c
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.1.2.3.ebuild,v 1.3 2013/10/27 16:22:19 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
BASE_AMD64_URI="mirror://gentoo/amd64-debug-"
|
||||
BASE_X86_URI="mirror://gentoo/x86-debug-"
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-kde-${PVR}.tar.xz )
|
||||
java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-kde-java-${PVR}.tar.xz )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-gnome-${PVR}.tar.xz )
|
||||
java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-gnome-java-${PVR}.tar.xz )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-base-${PVR}.tar.xz )
|
||||
java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-base-java-${PVR}.tar.xz )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}${PN/-bin-debug}-kde-${PVR}.tar.xz )
|
||||
java? ( ${BASE_X86_URI}${PN/-bin-debug}-kde-java-${PVR}.tar.xz )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}${PN/-bin-debug}-gnome-${PVR}.tar.xz )
|
||||
java? ( ${BASE_X86_URI}${PN/-bin-debug}-gnome-java-${PVR}.tar.xz )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
!java? ( ${BASE_X86_URI}${PN/-bin-debug}-base-${PVR}.tar.xz )
|
||||
java? ( ${BASE_X86_URI}${PN/-bin-debug}-base-java-${PVR}.tar.xz )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
|
||||
RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/ || die
|
||||
}
|
||||
@ -1,12 +1,24 @@
|
||||
DIST amd64-bin-libreoffice-base-4.0.4.2.tar.xz 68176636 SHA256 53af3b3b7364e7af7cbb450624a39bec5135091634eb20d26cff11707bf16bb9 SHA512 ec6d5e3d3b52bd359f1f65c455a46948373699030b6368679145a5adf830c6fcce3fa7379780faeeee4c943738e43d1359940dfdee0753b3e5d6494de5c36c39 WHIRLPOOL f4208570557592d6d9add45297f0ab1a9c6907c2f57e767625c6d2ccc02687f2968259807fbcabd74eae36873c597eb086bc61474d27dea02ca682f84622d1ad
|
||||
DIST amd64-bin-libreoffice-base-4.1.2.3.tar.xz 83027128 SHA256 3943264b367a2bfc2cf13e9c591e63db8fe2ffe7642d6555d2e5ff56ddbdfa3d SHA512 18ce95d4abe481dfb117582f6530526c8e829d8265aff835881fc9d1adee7a79598947bab4a2e4dcf573fb7957a5621848f23e8835eaa126933931a5da63b678 WHIRLPOOL 9ce912b7c62fb04f5e49c1f547e15953cd41aa0311ca8ede55573ff3fa824955884b1754018a1570c05b3bf5e516020bad3c5348d73130320dc6b1de1b6ab719
|
||||
DIST amd64-bin-libreoffice-base-java-4.0.4.2.tar.xz 71695008 SHA256 be9c2c19c0381a97b52ec1cfdd7677565996f0989b2e063b8f3cf60b9fcd897c SHA512 91a3625e5307a8958c9c25588300105aa43b69efbf3882f84ad6f1d99a867fb715df65657c2da657841dfbea81059fd1755dc39a604dc9a137fc3082800a48ca WHIRLPOOL 6efd4aab715389c9807027f9588ee702d326c3ebb3952402ed85515b0ccb56b3082c1c4536f18b9de982bb323a30023ae100f424b0aedb646f3a25bdb76f0a36
|
||||
DIST amd64-bin-libreoffice-base-java-4.1.2.3.tar.xz 86406900 SHA256 e7efa5a7459d88af0032d25f90b04bad4bf131307293777fd9d4df42bf387019 SHA512 fe0e32ca192959aa615ef1cfa1592ab09baf0347237fb37b4146e90366e7bf38327b0e47755e65090912a729b80d2333f44545713b779254522e7c2404ec7e05 WHIRLPOOL a7cc19baeeecc6eb241a882d390b466121eb7900d1c3c8311d26581c0c3e90e97a714637eeadb9be1a59a1423607cbc4ce272dde119c42640fd00547f33dfcba
|
||||
DIST amd64-bin-libreoffice-gnome-4.0.4.2.tar.xz 68305864 SHA256 e2242b660701cb9de3fd663f154ae705f3cecc70b0a785dccbc0482652b2c861 SHA512 106a447b5caafca6f76e3c30f282a95a51d98b8cfa57591c684f0d76a4c3eae96630845117d80195eec97815aec24dc35464454050ee83c5af5034871446566f WHIRLPOOL f13a8c6ccc84e15485f6b061dfca3b88e0ed293c514da0600a415b0f70fd9e76a99a9a8f57c68b04831579585e4fe034618c0282e2d2079d0ae8a2f22c3c0a02
|
||||
DIST amd64-bin-libreoffice-gnome-4.1.2.3.tar.xz 83154304 SHA256 91213169a64ce9947aaad4e728d522c07ec559c931a705b76803119e93d9c115 SHA512 8d8dc0bdca3caedab2ac2ca4c8019d86f4bd3e9db122968981181cca63ed508ab902c9abf2fc42a6d7229902a878c4a99b36f11a1d73c7e831845ee034b3d89a WHIRLPOOL 389fa3aeb9c3690a8e08b9d75736eff123fef2eaf79cca2cc5719ed706003307421b30a9dc39fd61fc245e82fea030485e5fd9f095278d85f79ce5722e0d7ba2
|
||||
DIST amd64-bin-libreoffice-gnome-java-4.0.4.2.tar.xz 71818144 SHA256 a2243af72e3538ea68ca57a192f35509098dde9c11af4baaf5a1380012c3c584 SHA512 0d8839b5342e58f20d58adf992da2e6d6ab59ecfb4d21f352d943b4fd2a66e6e92a556067192a6f4cb63508e598d51eeb84edd98c775abfa1a06d137a81e5062 WHIRLPOOL ddaf069b52e59150ab85c02d3b7736ae710f08bd37efb90bd327e6b85e22184594713448bb2e89f04b422700f97d4c036c0dd57d45bb50946f4228ff89a0277d
|
||||
DIST amd64-bin-libreoffice-gnome-java-4.1.2.3.tar.xz 86514236 SHA256 08beb3d2bcbfbe2ac10968d435f71f2bcd6b1be5b6de646d6db2999866164704 SHA512 194bc52dcfbb18c48deebb22d187b4eebe5349152a40914ecb280b97c0a4e77dbfc313c9dfd40c9cd3e05d3ccc0afeb09dcaaf1f487ffb9f0c034554cefa76af WHIRLPOOL 034cc1c2ee0b04b7b1657ae52a05f960ff15d4d34270a3287faee502d677d9ab5a0e0a1ab8e3b3c6974b77d3fc474817a0fe29feccccceff144f964fcb7334ba
|
||||
DIST amd64-bin-libreoffice-kde-4.0.4.2.tar.xz 68206468 SHA256 e0878607cf36e8cdbd070a6755b84ba01c27a9f7ba66b2a2c379c3c1af524721 SHA512 4d2f3f029ec87276a2489e9e00a06d9c7dfca4f8b6333319aca663e6545fc962ddde5eb9b753a9a7dcd413790df064c552bec14af268f34d59e275a5b1f8e274 WHIRLPOOL ca052159d24c4aafcd87fe347e0dcc93d34e813e45a5ded0eb2d8b4eab781106b4ffb2ab6428ed5c50db71fe1e1852bc605fc32f2201fcf1e878dd142f87976d
|
||||
DIST amd64-bin-libreoffice-kde-4.1.2.3.tar.xz 83073396 SHA256 a32e52bfc59c1f8fcf27431eff629b081bf90f16ae218e7cc31aa78a6fc4396d SHA512 aba8bc03bf1e15c6b41b51eafa1073dae42e7add5178182397c323f61caaa56484933c8698451386e1d1ad9cfe148485314654c6dcd71f30e0e266ff1985938a WHIRLPOOL 97fdd74be5a84a27a50700045aca1d0347ef0f10c01efb355e2ad38ed07231c9431fe123d123e7267c652269e90cb2ab7860392ec9fa7ddde89bd140393d7921
|
||||
DIST amd64-bin-libreoffice-kde-java-4.0.4.2.tar.xz 71725180 SHA256 7759254be790135dc8d6cbb03296ace9e208c969004d5bb6ce3069842f7e7d3a SHA512 e8015b988fc21c82264175f2d8e09eda351e8f750b2ca60731114fbf15d83dd6cdbafda1169a0ba59d153927d496c1b6051085e5dd3f995c6a291ea2eaae686f WHIRLPOOL 2a00ba0e93bc700c1cac1660840dcc836e7135c6d120a0861ee223bc353634bf56c7f51a832ff4f6b86138e2e9ed85acaed6074bc4c87c2257d2f2d2e3e8026f
|
||||
DIST amd64-bin-libreoffice-kde-java-4.1.2.3.tar.xz 86429448 SHA256 62997b4f95fd99f5e045334d59da5edf46174c2c82353bfb055931ef67150989 SHA512 686f93ac5865565cf3b89b226e615c358e96bc1aff66fa8143ba08651a21c67ede8ad7acd0a8be517112a843f4527ed8a38144f2effca8eeacf5108ba86bb210 WHIRLPOOL cdfcf20621a61a821b8c9aaaab4eb81c20a21463f5bf12f88b8d4bf8acbc21f666a3102ed03f11e34f994fbdd2dd4beeb238dee3a3ec4a0cb119e7a7d7697335
|
||||
DIST x86-bin-libreoffice-base-4.0.4.2.tar.xz 67099064 SHA256 e11495a6588c3ba8f25c89a4d6dce79e5a230a617a22d60e4fc549266315be3d SHA512 f587fd02c6c9733379c7b2e48a3704426eb4bb44b321ca866c74835f3d7f4132e4361a89c793321ccd00bbc8f9323817ebf05603c0111ff1c958d3ba8775fffc WHIRLPOOL 371de209e765841a24189a494a33b698c2fc5c37fe7a1aaaa9dcc3d89182e74548cc87838bd72142dd824dd15275c2d58c9e425b3287f19d0c3f9088f76e76d9
|
||||
DIST x86-bin-libreoffice-base-4.1.2.3.tar.xz 82506664 SHA256 278d1bcc60c47e93c25dd2a729473501c72e203d937e5def1321f94222c2e9fa SHA512 07a9eb0b1b95b187e57c9286df0c11e57ca0749f7e235a8ff63e84cb351f64e40885c085b96c0d92a713b6279626643420120d3d525e302798702a7780da96bb WHIRLPOOL 8826b952ed6bfecf45590bb3d855f40d548148ef37d338cbd740690d9a419b15249074bc6b7cf6305b5f71332930177f8e5e6dc828a95d3b8f411fe71096e65b
|
||||
DIST x86-bin-libreoffice-base-java-4.0.4.2.tar.xz 70622860 SHA256 feba2e04f80eeb842262bb4a72a2dc4425c0ffbebdd8230fa3986235780f41af SHA512 7df9b4aa64b040dbc54c9763720240b188aede8aba57eca767f96d8b280ea2c496293c9a9271beed3d22b8dfeab138e36eb6fd417abf4621d99ac4ee23263cb1 WHIRLPOOL 383c3cb46f915b1f7f86685e555a730a2f9c5337d6f849e79b7154769186aaa32ebb09ce1ca0a5231a07071b03defc9dd232f3f3e70bdec223e0ee6c568c0163
|
||||
DIST x86-bin-libreoffice-base-java-4.1.2.3.tar.xz 85867312 SHA256 b0e45380ce6b90334c388e850acf20454088c3ed7412a3b747f2a95724db1b34 SHA512 01bee2328dd79055984c0c12b4e65f42c0c27de01c1a13b7b593838bfa2b609269d07b2ffeb1dc475a240b7ecaa8eadb0fdc80b6e183659cc09f80efc490f44b WHIRLPOOL c428c1f4efbf67ef9a9fa2defe86e1c7449b5755f8ad8e9115f133d630f6bc8d8a1229ed1f0e3a2a8124be24c7a984480dc07c8f89004a81305fbcd925efdb30
|
||||
DIST x86-bin-libreoffice-gnome-4.0.4.2.tar.xz 67230928 SHA256 f97a56782cd9602df863fd2eebd06eaf13b79a05e6c6b155571cc191d7f324d8 SHA512 1df5cebde905f60a6fc9b0d78d314325d6e3b7990f36861a74fbb531d261fd922006e8d04e2e247419df21a81c536eb40cd92d04028c967de4923c3ce52e6e3d WHIRLPOOL 701dcf7e4ed43f922986b569855cb3085eaba501fbbdb94d9bd4d6eef694d3c034d111f046d733f1bd1fc5b4f25405b1146aabd90bc3b77d9b20553b391eb904
|
||||
DIST x86-bin-libreoffice-gnome-4.1.2.3.tar.xz 82627804 SHA256 c57d3f6c4b05219fc5d0593c36bc51beb9c1584caeac2bad6f71e69eacebfaa7 SHA512 0be3a3c31bbb2edb9419fec4a74dedbf4693994553bf8f53915d6c1af80351c229b8dc754b5fb503c071383bd348f8436a3eafaf55d069692c0fc54be0cfb266 WHIRLPOOL 3db22ed9243ba1657457b64112818d1ec32ab3dbacb3f43c3f644a59aa6e6d15cb20b328011a41032b3b7e4ca95edfe97f174fe25773d8ba47d971900ea696b5
|
||||
DIST x86-bin-libreoffice-gnome-java-4.0.4.2.tar.xz 70740904 SHA256 0bab833b7698c531901dff382a997ca50a9239418bf02822e21f9239acd6e304 SHA512 71453440b9852175964ebcc9f14e00bc2c31771bdac8471967d4d412b118db4cf1eddb68997bfee4356fc5319e06b66f08f7a804a25701e69c57f3dc8ccd4b2d WHIRLPOOL 11d4328c4ded4ccc72650bbd67461f42a920a86abb06ae3eed55a0f7a0da20053ae6673bfa698be286c5cb7cadb0bbb5b76b16d3128ec53512b6a9979893281c
|
||||
DIST x86-bin-libreoffice-gnome-java-4.1.2.3.tar.xz 85971340 SHA256 4a5ec50578f8eca9a7af72c4cd0f762fb881a72c8c9cdf9a7a2edfb5fe8ce50d SHA512 dc18ed6f9698b3a545eb7d3dee3cd22a51276ad2348564dda55c8957f2ef760b51ee1ffc4c3cbf3bf52651531efd0cd658a5424c224411c90f86a1e47cb625ec WHIRLPOOL 4996a2dd01ab7fa10b4f72b46d65f7b59463ec9a208929a86d109c3247cf1e780ebd63d77dfe7cb66ccd937f6720c462fcb7ef01d42e1d656b7665024758cb43
|
||||
DIST x86-bin-libreoffice-kde-4.0.4.2.tar.xz 67144016 SHA256 9869dd633778218445a11efbdcd94aa28e8d0aff923370352d720f942ece929d SHA512 4ebef16308bfe505a1f986947adaf7dd6ad026bd52078e2ec02b79ab00ebb5fd7f521c39cd8d06b9f6a28f6745490d951567f7f9409b76e30b4df5bf181e9fa6 WHIRLPOOL 0ea9c634246aa0439ab18b55f922d78b80866d1d8db36ff4d66acdb48109c7a76c818b624958409462bdfbe0277c081eac50385c7783ba54c873d502be29a787
|
||||
DIST x86-bin-libreoffice-kde-4.1.2.3.tar.xz 82550148 SHA256 e51947b649c01b91515b9a0048c77c1233e0c0d03b8d84f13147833224a49577 SHA512 367a808d6b40b15f5b88a25ad4a416e3b28b3e34b1e98626191683e1a855012f7f26e668c4aaa976af7cb1d0f01a1e7f5951382b62f892ba3be52f86cd2269f3 WHIRLPOOL 6d6c5aff100bb5dc42216d31b4f9f66b0403560c3d48fec19974a1bcdfcf675f1a899be7189a3e4b573df269a7340a3e0b6a7c79f2c9bbd233ca075c1e31e77c
|
||||
DIST x86-bin-libreoffice-kde-java-4.0.4.2.tar.xz 70649076 SHA256 393483f5867935edcf3d12e5505d22a7a199cc8c103908ba61a4babd45a5e7af SHA512 298f6265089be935b66d688a22e158efa9b9731a7304e547f3f353347379fbf4ed3459c337fc8573726a721e9b11556fc3a9fc25e667e91e6fa26defed61fb4e WHIRLPOOL b0a5ebcc084f234256481c89ebb6b9b655f1ad707c97e3f709adfacac8024a2654e74e764d2a34fb2db21a67f0d044db101977cac7de45e4425b906f7119e5c8
|
||||
DIST x86-bin-libreoffice-kde-java-4.1.2.3.tar.xz 85905960 SHA256 2e440db2c2de72cf4c56a36baea2b72399c94da13715fb08f2c6cca4ecb9931b SHA512 37612aa3c0d84c24728263d328e2d336deaee50e4f083c03ef737a9be8044e7c86e79d00537c12872cd0f65179199a241975e72f6b380e6f1c8a3e295da24c56 WHIRLPOOL b7094a5deea9c918fe888994427a5d23b9a71309a5714c9d2698a8d356665160019da6ebe0102f2f152e74213cde824f90b652f038bc4e2bfc77e7089c9b7fba
|
||||
|
||||
@ -0,0 +1,207 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.1.2.3.ebuild,v 1.4 2013/10/27 16:22:14 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
|
||||
BASE_X86_URI="mirror://gentoo/x86-bin-"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_3 )
|
||||
PYTHON_REQ_USE="threads,xml"
|
||||
|
||||
inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-${PVR}.tar.xz )
|
||||
java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
|
||||
java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}${PN/-bin}-base-${PVR}.tar.xz )
|
||||
java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}${PN/-bin}-kde-${PVR}.tar.xz )
|
||||
java? ( ${BASE_X86_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
|
||||
java? ( ${BASE_X86_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
!java? ( ${BASE_X86_URI}${PN/-bin}-base-${PVR}.tar.xz )
|
||||
java? ( ${BASE_X86_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="debug gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
|
||||
BIN_COMMON_DEPEND="
|
||||
=app-text/libexttextcat-3.4*
|
||||
app-text/poppler:0/37
|
||||
dev-libs/boost:0/1.52
|
||||
dev-libs/icu:0/51.1
|
||||
=media-gfx/graphite2-1.2*
|
||||
=media-libs/libpng-1.5.15
|
||||
>=sys-libs/glibc-2.15-r3
|
||||
kde? ( >=kde-base/kdelibs-4.10.5-r1:4 >=dev-qt/qtcore-4.8.4-r5:4 )
|
||||
|| ( <media-libs/libjpeg-turbo-1.3.0-r2 =media-libs/jpeg-8* )
|
||||
"
|
||||
|
||||
# PLEASE place any restrictions that are specific to the binary builds
|
||||
# into the BIN_COMMON_DEPEND block above.
|
||||
# All dependencies below this point should remain identical to those in
|
||||
# the source ebuilds.
|
||||
|
||||
COMMON_DEPEND="
|
||||
${BIN_COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
>=app-text/libexttextcat-3.2
|
||||
app-text/liblangtag
|
||||
app-text/libmspub
|
||||
>=app-text/libmwaw-0.1.7
|
||||
app-text/libodfgen
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
>=dev-cpp/libcmis-0.3.1:0.3
|
||||
dev-db/unixODBC
|
||||
>=dev-libs/boost-1.46:=
|
||||
dev-libs/expat
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1:=
|
||||
>=dev-libs/liborcus-0.5.1:=
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d
|
||||
>=dev-libs/redland-1.0.16[ssl]
|
||||
media-gfx/graphite2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
>=media-libs/harfbuzz-0.9.10:=[icu(+)]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.4
|
||||
>=media-libs/libcdr-0.0.5
|
||||
media-libs/libvisio
|
||||
>=net-misc/curl-7.21.4
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
virtual/jpeg
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
net-print/cups
|
||||
>=dev-libs/dbus-glib-0.92
|
||||
gnome? ( gnome-extra/evolution-data-server )
|
||||
gnome? ( gnome-base/gconf:2 )
|
||||
x11-libs/gdk-pixbuf[X]
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
net-libs/neon
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice
|
||||
!<app-office/openoffice-bin-3.4.0-r1
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine-ttf
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-4.0*
|
||||
"
|
||||
|
||||
DEPEND=""
|
||||
|
||||
# only one flavor at a time
|
||||
REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
PYTHON_UPDATER_IGNORE="1"
|
||||
|
||||
pkg_pretend() {
|
||||
[[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
|
||||
&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
kde4-base_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cp "${FILESDIR}"/50-${PN} "${T}"
|
||||
eprefixify "${T}"/50-${PN}
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/
|
||||
|
||||
# prevent revdep-rebuild from attempting to rebuild all the time
|
||||
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -0,0 +1,105 @@
|
||||
configdialog.cpp | 2 +-
|
||||
texmaker.cpp | 4 ++--
|
||||
texmaker.pro | 42 +-----------------------------------------
|
||||
3 files changed, 4 insertions(+), 44 deletions(-)
|
||||
|
||||
diff --git a/configdialog.cpp b/configdialog.cpp
|
||||
index e596a2c..3660429 100644
|
||||
--- a/configdialog.cpp
|
||||
+++ b/configdialog.cpp
|
||||
@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
|
||||
QDir spelldir(QCoreApplication::applicationDirPath());
|
||||
#else
|
||||
#ifdef DEBIAN_SPELLDIR
|
||||
-QDir spelldir(PREFIX"/share/myspell/dicts");
|
||||
+QDir spelldir(PREFIX"/share/myspell");
|
||||
#else
|
||||
QDir spelldir(PREFIX"/share/texmaker");
|
||||
#endif
|
||||
diff --git a/texmaker.cpp b/texmaker.cpp
|
||||
index 51d2082..607f66e 100644
|
||||
--- a/texmaker.cpp
|
||||
+++ b/texmaker.cpp
|
||||
@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
|
||||
QString dicDir=QCoreApplication::applicationDirPath() + "/";
|
||||
#else
|
||||
#ifdef DEBIAN_SPELLDIR
|
||||
-QString dicDir=PREFIX"/share/myspell/dicts/";
|
||||
+QString dicDir=PREFIX"/share/myspell/";
|
||||
#else
|
||||
QString dicDir=PREFIX"/share/texmaker/";
|
||||
#endif
|
||||
@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
|
||||
UpdateBibliography();
|
||||
}
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/texmaker.pro b/texmaker.pro
|
||||
index bce8dd4..2f205bb 100644
|
||||
--- a/texmaker.pro
|
||||
+++ b/texmaker.pro
|
||||
@@ -95,29 +95,6 @@ HEADERS += texmaker.h \
|
||||
versiondialog.h \
|
||||
unicodedialog.h \
|
||||
unicodeview.h \
|
||||
- hunspell/affentry.hxx \
|
||||
- hunspell/affixmgr.hxx \
|
||||
- hunspell/atypes.hxx \
|
||||
- hunspell/baseaffix.hxx \
|
||||
- hunspell/csutil.hxx \
|
||||
- hunspell/dictmgr.hxx \
|
||||
- hunspell/hashmgr.hxx \
|
||||
- hunspell/htypes.hxx \
|
||||
- hunspell/hunspell.hxx \
|
||||
- hunspell/hunspell.h \
|
||||
- hunspell/langnum.hxx \
|
||||
- hunspell/license.hunspell \
|
||||
- hunspell/phonet.hxx \
|
||||
- hunspell/suggestmgr.hxx \
|
||||
- hunspell/license.myspell \
|
||||
- hunspell/filemgr.hxx \
|
||||
- hunspell/hunzip.hxx \
|
||||
- hunspell/replist.hxx \
|
||||
- hunspell/w_char.hxx \
|
||||
- singleapp/qtlocalpeer.h \
|
||||
- singleapp/qtlockedfile.h \
|
||||
- singleapp/qtsingleapplication.h \
|
||||
- singleapp/qtsinglecoreapplication.h \
|
||||
encodingprober/CharDistribution.h \
|
||||
encodingprober/ChineseGroupProber.h \
|
||||
encodingprober/ctype_test_p.h \
|
||||
@@ -204,22 +181,6 @@ SOURCES += main.cpp \
|
||||
versiondialog.cpp \
|
||||
unicodedialog.cpp \
|
||||
unicodeview.cpp \
|
||||
- hunspell/affentry.cxx \
|
||||
- hunspell/affixmgr.cxx \
|
||||
- hunspell/csutil.cxx \
|
||||
- hunspell/dictmgr.cxx \
|
||||
- hunspell/hashmgr.cxx \
|
||||
- hunspell/hunspell.cxx \
|
||||
- hunspell/phonet.cxx \
|
||||
- hunspell/suggestmgr.cxx \
|
||||
- hunspell/utf_info.cxx \
|
||||
- hunspell/filemgr.cxx \
|
||||
- hunspell/replist.cxx \
|
||||
- hunspell/hunzip.cxx \
|
||||
- singleapp/qtlocalpeer.cpp \
|
||||
- singleapp/qtlockedfile.cpp \
|
||||
- singleapp/qtsingleapplication.cpp \
|
||||
- singleapp/qtsinglecoreapplication.cpp \
|
||||
encodingprober/CharDistribution.cpp \
|
||||
encodingprober/ChineseGroupProber.cpp \
|
||||
encodingprober/JapaneseGroupProber.cpp \
|
||||
@@ -328,8 +289,7 @@ icon.path = $${ICONDIR}
|
||||
|
||||
INSTALLS = target
|
||||
HEADERS += x11fontdialog.h
|
||||
-SOURCES += x11fontdialog.cpp \
|
||||
- singleapp/qtlockedfile_unix.cpp
|
||||
+SOURCES += x11fontdialog.cpp
|
||||
FORMS += x11fontdialog.ui
|
||||
|
||||
utilities.files = doc/doc1.png \
|
||||
@ -0,0 +1,7 @@
|
||||
CONFIG += link_pkgconfig
|
||||
|
||||
# System hunspell
|
||||
PKGCONFIG += hunspell
|
||||
|
||||
# System qtsingleapplication
|
||||
CONFIG += qtsingleapplication
|
||||
@ -0,0 +1,84 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.0.4-r1.ebuild,v 1.1 2013/10/26 09:47:18 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit qt4-r2 versionator
|
||||
|
||||
# The upstream version numbering is bad, so we have to remove a dot in the
|
||||
# minor version number
|
||||
MAJOR="$(get_major_version)"
|
||||
MINOR_1="$(($(get_version_component_range 2)/10))"
|
||||
MINOR_2="$(($(get_version_component_range 2)%10))"
|
||||
if [ ${MINOR_2} -eq "0" ] ; then
|
||||
MY_P="${PN}-${MAJOR}.${MINOR_1}"
|
||||
else
|
||||
MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
|
||||
fi
|
||||
|
||||
MY_P="${P}"
|
||||
|
||||
DESCRIPTION="A nice LaTeX-IDE"
|
||||
HOMEPAGE="http://www.xm1math.net/texmaker/"
|
||||
SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-text/hunspell
|
||||
app-text/poppler:=[qt4]
|
||||
sys-libs/zlib
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtsingleapplication
|
||||
dev-qt/qtwebkit:4
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
virtual/latex-base
|
||||
app-text/psutils
|
||||
app-text/ghostscript-gpl
|
||||
media-libs/netpbm"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
|
||||
|
||||
DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
|
||||
HTML_DOCS=( doc/. )
|
||||
|
||||
src_prepare() {
|
||||
find singleapp hunspell -delete || die
|
||||
|
||||
qt4-r2_src_prepare
|
||||
|
||||
cat >> ${PN}.pro <<- EOF
|
||||
exists(texmakerx_my.pri):include(texmakerx_my.pri)
|
||||
EOF
|
||||
cp "${FILESDIR}"/texmakerx_my.pri . || die
|
||||
|
||||
sed \
|
||||
-e '/^#include/s:hunspell/::g' \
|
||||
-e '/^#include/s:singleapp/::g' \
|
||||
-i *.cpp *.h || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake4 \
|
||||
${PN}.pro \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
DESKTOPDIR="${EPREFIX}/usr/share/applications" \
|
||||
ICONDIR="${EPREFIX}/usr/share/pixmaps"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "A user manual with many screenshots is available at:"
|
||||
elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
Fails on ghc-7.6 only as:
|
||||
|
||||
--- tables.man
|
||||
+++ ../dist/build/pandoc/pandoc --data-dir .. tables.native -r native -w man --columns=78
|
||||
- 141 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
|
||||
+ 141 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
|
||||
- 177 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
|
||||
+ 177 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
|
||||
- 247 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
|
||||
+ 247 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
|
||||
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
|
||||
index 67eb515..196fa45 100644
|
||||
--- a/tests/Tests/Old.hs
|
||||
+++ b/tests/Tests/Old.hs
|
||||
@@ -109,7 +109,7 @@ tests = [ testGroup "markdown"
|
||||
]
|
||||
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
|
||||
[ "opendocument" , "context" , "texinfo"
|
||||
- , "man" , "plain" , "mediawiki", "rtf", "org", "asciidoc"
|
||||
+ {- , "man" -} , "plain" , "mediawiki", "rtf", "org", "asciidoc"
|
||||
]
|
||||
]
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.9.4.5.ebuild,v 1.4 2012/12/29 07:32:40 slyfox Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.3.9999
|
||||
|
||||
CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
|
||||
inherit base haskell-cabal
|
||||
|
||||
DESCRIPTION="Conversion between markup formats"
|
||||
HOMEPAGE="http://johnmacfarlane.net/pandoc"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
|
||||
<dev-haskell/base64-bytestring-1.1:=[profile?]
|
||||
=dev-haskell/blaze-html-0.5*:=[profile?]
|
||||
>=dev-haskell/citeproc-hs-0.3.4:=[profile?]
|
||||
<dev-haskell/citeproc-hs-0.4:=[profile?]
|
||||
=dev-haskell/extensible-exceptions-0.1*:=[profile?]
|
||||
>=dev-haskell/highlighting-kate-0.5.1:=[profile?]
|
||||
<dev-haskell/highlighting-kate-0.6:=[profile?]
|
||||
>=dev-haskell/http-4000.0.5:=[profile?]
|
||||
<dev-haskell/http-4000.3:=[profile?]
|
||||
>=dev-haskell/json-0.4:=[profile?]
|
||||
<dev-haskell/json-0.8:=[profile?]
|
||||
>=dev-haskell/mtl-1.1:=[profile?]
|
||||
<dev-haskell/mtl-2.2:=[profile?]
|
||||
>=dev-haskell/network-2:=[profile?]
|
||||
<dev-haskell/network-2.5:=[profile?]
|
||||
>=dev-haskell/pandoc-types-1.9.0.2:=[profile?]
|
||||
<dev-haskell/pandoc-types-1.10:=[profile?]
|
||||
=dev-haskell/parsec-3.1*:=[profile?]
|
||||
>=dev-haskell/random-1:=[profile?]
|
||||
<dev-haskell/random-1.1:=[profile?]
|
||||
>=dev-haskell/syb-0.1:=[profile?]
|
||||
<dev-haskell/syb-0.4:=[profile?]
|
||||
>=dev-haskell/tagsoup-0.12.5:=[profile?]
|
||||
<dev-haskell/tagsoup-0.13:=[profile?]
|
||||
=dev-haskell/temporary-1.1*:=[profile?]
|
||||
>=dev-haskell/texmath-0.6.0.2:=[profile?]
|
||||
<dev-haskell/texmath-0.7:=[profile?]
|
||||
=dev-haskell/utf8-string-0.3*:=[profile?]
|
||||
>=dev-haskell/xml-1.3.12:=[profile?]
|
||||
<dev-haskell/xml-1.4:=[profile?]
|
||||
>=dev-haskell/zip-archive-0.1.1.7:=[profile?]
|
||||
<dev-haskell/zip-archive-0.2:=[profile?]
|
||||
=dev-haskell/zlib-0.5*:=[profile?]
|
||||
>=dev-lang/ghc-7.4.2:="
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( =dev-haskell/ansi-terminal-0.5*
|
||||
=dev-haskell/diff-0.1*
|
||||
=dev-haskell/hunit-1.2*
|
||||
>=dev-haskell/quickcheck-2.4
|
||||
<dev-haskell/quickcheck-2.6
|
||||
>=dev-haskell/test-framework-0.3
|
||||
<dev-haskell/test-framework-0.9
|
||||
>=dev-haskell/test-framework-hunit-0.2
|
||||
<dev-haskell/test-framework-hunit-0.4
|
||||
>=dev-haskell/test-framework-quickcheck2-0.2.9
|
||||
<dev-haskell/test-framework-quickcheck2-0.4
|
||||
)
|
||||
>=dev-haskell/cabal-1.10"
|
||||
|
||||
PATCHES=("${FILESDIR}"/${P}-disable-writes-other-man.patch)
|
||||
|
||||
src_prepare() {
|
||||
base_src_prepare
|
||||
|
||||
cabal_chdeps \
|
||||
'test-framework >= 0.3 && < 0.7' 'test-framework >= 0.3 && < 0.9' \
|
||||
'test-framework-hunit >= 0.2 && < 0.3' 'test-framework-hunit >= 0.2 && < 0.4' \
|
||||
'test-framework-quickcheck2 >= 0.2.9 && < 0.3' 'test-framework-quickcheck2 >= 0.2.9 && < 0.4'
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cabal_src_install
|
||||
|
||||
doman "${S}/man/man1/${PN}.1"
|
||||
|
||||
# COPYING is installed by the Cabal eclass
|
||||
dodoc README COPYRIGHT changelog
|
||||
}
|
||||
@ -0,0 +1,380 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.2 2013/10/27 12:13:15 caster Exp $
|
||||
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
|
||||
# *********************************************************
|
||||
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
|
||||
# *********************************************************
|
||||
|
||||
EAPI="5"
|
||||
|
||||
CHECKREQS_DISK_BUILD="9G"
|
||||
|
||||
inherit check-reqs java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
|
||||
|
||||
ICEDTEA_VER=$(get_version_component_range 2-)
|
||||
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
|
||||
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
|
||||
CORBA_TARBALL="8ed5df839fbc.tar.gz"
|
||||
JAXP_TARBALL="8f220f7b51c7.tar.gz"
|
||||
JAXWS_TARBALL="652eb396f959.tar.gz"
|
||||
JDK_TARBALL="7958751eb9ef.tar.gz"
|
||||
LANGTOOLS_TARBALL="3c8eb52a32ea.tar.gz"
|
||||
OPENJDK_TARBALL="e2f5917da3c1.tar.gz"
|
||||
HOTSPOT_TARBALL="b59e02d9e72b.tar.gz"
|
||||
CACAO_TARBALL="e215e36be9fc.tar.gz"
|
||||
JAMVM_TARBALL="jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz"
|
||||
|
||||
CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
|
||||
JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
|
||||
JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
|
||||
JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
|
||||
LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
|
||||
OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
|
||||
HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
|
||||
CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
|
||||
JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
|
||||
|
||||
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_PKG="${ICEDTEA_PKG}.tar.xz"
|
||||
SRC_URI="
|
||||
http://icedtea.classpath.org/download/source/${SRC_PKG}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
|
||||
-> ${OPENJDK_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
|
||||
-> ${CORBA_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
|
||||
-> ${JAXP_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
|
||||
-> ${JAXWS_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
|
||||
-> ${JDK_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
|
||||
-> ${HOTSPOT_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
|
||||
-> ${LANGTOOLS_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
|
||||
|
||||
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
|
||||
SLOT="7"
|
||||
KEYWORDS="~amd64 ~ia64 ~x86"
|
||||
|
||||
IUSE="+X +alsa cjk +cups debug doc examples javascript jbootstrap kerberos +nsplugin
|
||||
+nss pax_kernel pulseaudio +source systemtap test +webstart"
|
||||
|
||||
# Ideally the following were optional at build time.
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.2.12"
|
||||
X_COMMON_DEP="
|
||||
>=dev-libs/atk-1.30.0
|
||||
>=dev-libs/glib-2.26
|
||||
media-libs/fontconfig
|
||||
>=media-libs/freetype-2.3.5
|
||||
>=x11-libs/cairo-1.8.8
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-2.8:2
|
||||
>=x11-libs/libX11-1.1.3
|
||||
>=x11-libs/libXext-1.1.1
|
||||
>=x11-libs/libXi-1.1.3
|
||||
>=x11-libs/libXrender-0.9.4
|
||||
>=x11-libs/libXtst-1.0.3
|
||||
>=x11-libs/pango-1.24.5"
|
||||
X_DEPEND="
|
||||
>=x11-libs/libXau-1.0.3
|
||||
>=x11-libs/libXdmcp-1.0.2
|
||||
>=x11-libs/libXinerama-1.0.2
|
||||
x11-proto/inputproto
|
||||
>=x11-proto/xextproto-7.1.1
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto"
|
||||
|
||||
COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.2:=
|
||||
>=sys-libs/zlib-1.2.3
|
||||
virtual/jpeg:=
|
||||
javascript? ( dev-java/rhino:1.6 )
|
||||
nss? ( >=dev-libs/nss-3.12.5-r1 )
|
||||
pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
|
||||
kerberos? ( virtual/krb5 )
|
||||
systemtap? ( >=dev-util/systemtap-1 )"
|
||||
|
||||
# cups is needed for X. #390945 #390975
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!dev-java/icedtea:0
|
||||
X? (
|
||||
${CUPS_COMMON_DEP}
|
||||
${X_COMMON_DEP}
|
||||
media-fonts/dejavu
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
)
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cups? ( ${CUPS_COMMON_DEP} )"
|
||||
|
||||
# Require >=ant-core-1.8.2 so no additional ant tasks are needed. #466558
|
||||
# ca-certificates, perl and openssl are used for the cacerts keystore generation
|
||||
# xext headers have two variants depending on version - bug #288855
|
||||
# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
|
||||
|
||||
# FIXME: this version can't be built with icedtea-6
|
||||
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
|
||||
|| (
|
||||
>=dev-java/gcj-jdk-4.3
|
||||
dev-java/icedtea-bin:7
|
||||
dev-java/icedtea-bin:6
|
||||
dev-java/icedtea:7
|
||||
dev-java/icedtea:6
|
||||
)
|
||||
app-arch/cpio
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
app-misc/ca-certificates
|
||||
>=dev-java/ant-core-1.8.2
|
||||
dev-lang/perl
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
dev-libs/openssl
|
||||
virtual/pkgconfig
|
||||
sys-apps/attr
|
||||
sys-apps/lsb-release
|
||||
${X_DEPEND}
|
||||
pax_kernel? ( sys-apps/paxctl )"
|
||||
|
||||
PDEPEND="webstart? ( || (
|
||||
dev-java/icedtea-web:0
|
||||
>=dev-java/icedtea-web-1.3.2:7
|
||||
) )
|
||||
nsplugin? ( || (
|
||||
dev-java/icedtea-web:0[nsplugin]
|
||||
>=dev-java/icedtea-web-1.3.2:7[nsplugin]
|
||||
) )"
|
||||
|
||||
S="${WORKDIR}"/${ICEDTEA_PKG}
|
||||
|
||||
pkg_pretend() {
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
check-reqs_pkg_setup
|
||||
|
||||
JAVA_PKG_WANT_BUILD_VM="
|
||||
icedtea-7 icedtea-bin-7 icedtea7
|
||||
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
|
||||
gcj-jdk"
|
||||
JAVA_PKG_WANT_SOURCE="1.5"
|
||||
JAVA_PKG_WANT_TARGET="1.5"
|
||||
|
||||
java-vm-2_pkg_setup
|
||||
java-pkg-2_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${SRC_PKG}
|
||||
}
|
||||
|
||||
java_prepare() {
|
||||
# For bootstrap builds as the sandbox control file might not yet exist.
|
||||
addpredict /proc/self/coredump_filter
|
||||
|
||||
# icedtea doesn't like some locales. #330433 #389717
|
||||
export LANG="C" LC_ALL="C"
|
||||
}
|
||||
|
||||
bootstrap_impossible() {
|
||||
# Fill this according to testing what works and what not
|
||||
# icedtea-6 is often the case
|
||||
#has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
|
||||
false
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local config bootstrap
|
||||
local vm=$(java-pkg_get-current-vm)
|
||||
|
||||
# Whether to bootstrap
|
||||
bootstrap="disable"
|
||||
if use jbootstrap; then
|
||||
if bootstrap_impossible "${vm}"; then
|
||||
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
|
||||
else
|
||||
bootstrap="enable"
|
||||
fi
|
||||
fi
|
||||
|
||||
if has "${vm}" gcj-jdk; then
|
||||
# gcj-jdk ensures ecj is present.
|
||||
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
|
||||
bootstrap="enable"
|
||||
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
|
||||
config="${config} --with-ecj-jar=${ecj_jar}"
|
||||
fi
|
||||
|
||||
config="${config} --${bootstrap}-bootstrap"
|
||||
|
||||
# HotSpot > CACAO > JamVM > Zero, though CACAO is somewhat memory hungry
|
||||
# CACAO is not yet available for icedtea-7
|
||||
case "${ARCH}" in
|
||||
amd64|sparc|x86)
|
||||
;;
|
||||
arm)
|
||||
config+=" --enable-jamvm" #IT1266
|
||||
replace-flags -Os -O2 #BGO453612 #IT1267
|
||||
;;
|
||||
ppc|ppc64)
|
||||
config+=" --enable-jamvm"
|
||||
;;
|
||||
*)
|
||||
config+=" --enable-zero"
|
||||
HOTSPOT_GENTOO_TARBALL=${ZERO_GENTOO_TARBALL}
|
||||
;;
|
||||
esac
|
||||
|
||||
# OpenJDK-specific parallelism support. Bug #389791, #337827
|
||||
# Implementation modified from waf-utils.eclass
|
||||
# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
|
||||
local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
|
||||
config="${config} --with-parallel-jobs=${procs}";
|
||||
einfo "Configuring using --with-parallel-jobs=${procs}"
|
||||
|
||||
if use javascript ; then
|
||||
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
|
||||
else
|
||||
config="${config} --without-rhino"
|
||||
fi
|
||||
|
||||
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
|
||||
|
||||
econf ${config} \
|
||||
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
|
||||
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
|
||||
--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
|
||||
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
|
||||
--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
|
||||
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
|
||||
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
|
||||
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
|
||||
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
|
||||
--with-jdk-home="$(java-config -O)" \
|
||||
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
|
||||
--disable-downloading --disable-Werror \
|
||||
--enable-system-lcms \
|
||||
$(use_enable !debug optimizations) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable nss) \
|
||||
$(use_enable pulseaudio pulse-java) \
|
||||
$(use_enable kerberos system-kerberos) \
|
||||
$(use_with pax_kernel pax paxctl)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Would use GENTOO_VM otherwise.
|
||||
export ANT_RESPECT_JAVA_HOME=TRUE
|
||||
# disable all optional ant tasks
|
||||
export ANT_TASKS="none"
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Use Xvfb for tests
|
||||
unset DISPLAY
|
||||
|
||||
Xemake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
|
||||
local ddest="${ED}/${dest}"
|
||||
dodir "${dest}"
|
||||
|
||||
dodoc README NEWS AUTHORS
|
||||
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
|
||||
|
||||
cd openjdk.build/j2sdk-image || die
|
||||
|
||||
# Ensures HeadlessGraphicsEnvironment is used.
|
||||
if ! use X; then
|
||||
rm -r jre/lib/$(get_system_arch)/xawt || die
|
||||
fi
|
||||
|
||||
# Don't hide classes
|
||||
rm lib/ct.sym || die
|
||||
|
||||
#402507
|
||||
mkdir jre/.systemPrefs || die
|
||||
touch jre/.systemPrefs/.system.lock || die
|
||||
touch jre/.systemPrefs/.systemRootModFile || die
|
||||
|
||||
# doins can't handle symlinks.
|
||||
cp -vRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
|
||||
|
||||
if use doc; then
|
||||
# java-pkg_dohtml needed for package-list #302654
|
||||
java-pkg_dohtml -r ../docs/* || die
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
dodir "${dest}/share";
|
||||
cp -vRP demo sample "${ddest}/share/" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
# Fix the permissions.
|
||||
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
|
||||
|
||||
# Needs to be done before generating cacerts
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
# We need to generate keystore - bug #273306
|
||||
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
|
||||
mkdir "${T}/certgen" && cd "${T}/certgen" || die
|
||||
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
|
||||
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
|
||||
openssl x509 -text -in "${c}" >> all.crt || die
|
||||
done
|
||||
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
|
||||
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
|
||||
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
|
||||
|
||||
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
|
||||
# install it anyway. Bug 390663
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
|
||||
eprefixify "${T}"/fontconfig.Gentoo.properties
|
||||
insinto "${dest}"/jre/lib
|
||||
doins "${T}"/fontconfig.Gentoo.properties
|
||||
|
||||
set_java_env "${FILESDIR}/icedtea.env"
|
||||
if ! use X || ! use alsa || ! use cups; then
|
||||
java-vm_revdep-mask "${dest}"
|
||||
fi
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<=dev-java/icedtea-7.2.0:7"; then
|
||||
# portage would preserve the symlink otherwise, related to bug #384397
|
||||
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
|
||||
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
|
||||
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
|
||||
elog "If you had icedtea7 as system VM, the change should be automatic, however"
|
||||
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
|
||||
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
|
||||
fi
|
||||
}
|
||||
@ -1,10 +1,7 @@
|
||||
DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
|
||||
DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7
|
||||
DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
|
||||
DIST apache-tomcat-6.0.36-src.tar.gz 3411736 SHA256 8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c SHA512 6646c54c6e2ce440b07401b0560617204cf6e8d65885120165cb38a9cabe8f3dc61d07330e5b03be1ad480bb131f2d63aef86e367d180df96e053200587384b3 WHIRLPOOL 5e168a6cd3389cb98d0a01a2bd23f4fb49eaa82af134175c21eca3975c1ca1a6003db023d8bc069f95d4ba43dd053e28e03ff626a5b09da74dc2ba365b8c9821
|
||||
DIST apache-tomcat-6.0.37-src.tar.gz 3430692 SHA256 665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281 SHA512 b4f3c795aa760854f52e2286073f2612602e95245e7075d7c9033d3fb455ef6077cdd1f5b0c0229d5b75d32f2cb436154cc9c7b1a8ddf2e59e0ed2f095789958 WHIRLPOOL 3cec31dfd5e7e22fb6e3a87bfdb6a1b58e353faa023a9d3703043746e22afd379249ca5378cddaddac1e6c59130fe5465b359e887d991713aea0cf4f9bd5188d
|
||||
DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
|
||||
DIST apache-tomcat-7.0.39-src.tar.gz 4295207 SHA256 d9b4daceb2040bff84dbc37ea07d442cf6b0a608b2d161f15740147fac76101d SHA512 f3c054e66f65ea2721c53280e69b069c035f0a870d57c898a4fec716f23bf66be833d2898ae36da44cd13201a3d43984e3b2266927aad5fe3e2245d7f499323d WHIRLPOOL b2b3572bb6c15147bd4c25f90d0b8e1cafe1151bd2736ce3d60828818f87481e1c94448684c825816c6741cda1d5e1c091440245c2ae48cde23779ad55d683e7
|
||||
DIST apache-tomcat-7.0.41-src.tar.gz 4407748 SHA256 283a80c5be1a1eda9fc8864b11dcd026ba3bf2433b0d8377a4da4c2536a07ea6 SHA512 dadff0f20e5e7b5c4b46ee7ba4c3bc8776568b6fff182cfd3764abd5eba6e7bb4239a3700969c6065b8991ba8a04061042a917e7bfe29de2afbcce788554fd9e WHIRLPOOL 2bd6dc37704709f0ce1096df1bd96faaf63aa1796d664777ad4f4280e22bbcd0acc06cc48eae852481ef60a16efdf8ae6a1ca2dd4c5dc06ea6ed684103dbfa65
|
||||
DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72 SHA512 02703483ceeb218fdbb9c57cd45af3572d0c482ff0914e29862646bf395d03f81efd94271ffa6a59412df1b6cbecc7380e7bfb9e83da8db6a8f63355b722bcd0 WHIRLPOOL 21ba3934169ef9672f0f160e45dad4cdf04827e64bb3fcce1eac6fa7a9d4cf5b699bb96dd07a900bbea1099d35a91fe0df3dbcbdeeef44ef3e969af78aaafcd2
|
||||
DIST apache-tomcat-7.0.47-src.tar.gz 4568824 SHA256 be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99 SHA512 bb0d2c5ecc05b69655ebb6073e92ab379b588e18ea2d4e5883297ce528d6a6e7a400e3038d93f6d5e79be24687105e4fd3d6ab62b616da715f333dd9067dbaf8 WHIRLPOOL 126b2bae767c620ed0b4bd83ed71cea3f6ea81862258bce1273e7840682b771fca55393e6090300e9635d3839b9de9d48aa346bef8d06fb87b435f20e6b32495
|
||||
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.36.ebuild,v 1.7 2013/02/05 07:04:54 zerochaos Exp $
|
||||
|
||||
EAPI="2"
|
||||
JAVA_PKG_IUSE="source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
MY_A="apache-${P}-src"
|
||||
MY_P="${MY_A/-servlet-api/}"
|
||||
DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
|
||||
HOMEPAGE="http://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2.5"
|
||||
KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.5"
|
||||
RDEPEND=">=virtual/jre-1.5"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/"
|
||||
|
||||
java_prepare() {
|
||||
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
|
||||
rm */*/build.xml
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar "${S}"/output/build/lib/*.jar
|
||||
use source && java-pkg_dosrc java/javax/servlet/
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.32.ebuild,v 1.5 2012/12/06 00:53:59 ago Exp $
|
||||
|
||||
EAPI="2"
|
||||
JAVA_PKG_IUSE="source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
MY_A="apache-${P}-src"
|
||||
MY_P="${MY_A/-servlet-api/}"
|
||||
DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
|
||||
HOMEPAGE="http://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.0"
|
||||
KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6"
|
||||
RDEPEND=">=virtual/jre-1.6"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/"
|
||||
|
||||
java_prepare() {
|
||||
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
|
||||
rm -fR */*/build.xml
|
||||
einfo "Removing bundled jars and classes"
|
||||
find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar "${S}"/output/build/lib/*.jar
|
||||
use source && java-pkg_dosrc java/javax/servlet/
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.39.ebuild,v 1.1 2013/03/28 12:55:47 fordfrog Exp $
|
||||
|
||||
EAPI="2"
|
||||
JAVA_PKG_IUSE="source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
MY_A="apache-${P}-src"
|
||||
MY_P="${MY_A/-servlet-api/}"
|
||||
DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
|
||||
HOMEPAGE="http://tomcat.apache.org/"
|
||||
SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3.0"
|
||||
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6"
|
||||
RDEPEND=">=virtual/jre-1.6"
|
||||
|
||||
S="${WORKDIR}/${MY_P}/"
|
||||
|
||||
java_prepare() {
|
||||
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
|
||||
rm -fR */*/build.xml
|
||||
einfo "Removing bundled jars and classes"
|
||||
find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar "${S}"/output/build/lib/*.jar
|
||||
use source && java-pkg_dosrc java/javax/servlet/
|
||||
}
|
||||
@ -0,0 +1,287 @@
|
||||
# HG changeset patch
|
||||
# User Antoine Pitrou <solipsis@pitrou.net>
|
||||
# Date 1377898693 -7200
|
||||
# Node ID 43749cb6bdbd0fdab70f76cd171c3c02a3f600dd
|
||||
# Parent ba54011aa295004ad87438211fe3bb1568dd69ab
|
||||
Issue #18851: Avoid a double close of subprocess pipes when the child process fails starting.
|
||||
|
||||
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
|
||||
--- a/Lib/subprocess.py
|
||||
+++ b/Lib/subprocess.py
|
||||
@@ -698,12 +698,12 @@ class Popen(object):
|
||||
|
||||
(p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
- errread, errwrite) = self._get_handles(stdin, stdout, stderr)
|
||||
+ errread, errwrite), to_close = self._get_handles(stdin, stdout, stderr)
|
||||
|
||||
try:
|
||||
self._execute_child(args, executable, preexec_fn, close_fds,
|
||||
cwd, env, universal_newlines,
|
||||
- startupinfo, creationflags, shell,
|
||||
+ startupinfo, creationflags, shell, to_close,
|
||||
p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
errread, errwrite)
|
||||
@@ -711,18 +711,12 @@ class Popen(object):
|
||||
# Preserve original exception in case os.close raises.
|
||||
exc_type, exc_value, exc_trace = sys.exc_info()
|
||||
|
||||
- to_close = []
|
||||
- # Only close the pipes we created.
|
||||
- if stdin == PIPE:
|
||||
- to_close.extend((p2cread, p2cwrite))
|
||||
- if stdout == PIPE:
|
||||
- to_close.extend((c2pread, c2pwrite))
|
||||
- if stderr == PIPE:
|
||||
- to_close.extend((errread, errwrite))
|
||||
-
|
||||
for fd in to_close:
|
||||
try:
|
||||
- os.close(fd)
|
||||
+ if mswindows:
|
||||
+ fd.Close()
|
||||
+ else:
|
||||
+ os.close(fd)
|
||||
except EnvironmentError:
|
||||
pass
|
||||
|
||||
@@ -816,8 +810,9 @@ class Popen(object):
|
||||
"""Construct and return tuple with IO objects:
|
||||
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
|
||||
"""
|
||||
+ to_close = set()
|
||||
if stdin is None and stdout is None and stderr is None:
|
||||
- return (None, None, None, None, None, None)
|
||||
+ return (None, None, None, None, None, None), to_close
|
||||
|
||||
p2cread, p2cwrite = None, None
|
||||
c2pread, c2pwrite = None, None
|
||||
@@ -835,6 +830,10 @@ class Popen(object):
|
||||
# Assuming file-like object
|
||||
p2cread = msvcrt.get_osfhandle(stdin.fileno())
|
||||
p2cread = self._make_inheritable(p2cread)
|
||||
+ # We just duplicated the handle, it has to be closed at the end
|
||||
+ to_close.add(p2cread)
|
||||
+ if stdin == PIPE:
|
||||
+ to_close.add(p2cwrite)
|
||||
|
||||
if stdout is None:
|
||||
c2pwrite = _subprocess.GetStdHandle(_subprocess.STD_OUTPUT_HANDLE)
|
||||
@@ -848,6 +847,10 @@ class Popen(object):
|
||||
# Assuming file-like object
|
||||
c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
|
||||
c2pwrite = self._make_inheritable(c2pwrite)
|
||||
+ # We just duplicated the handle, it has to be closed at the end
|
||||
+ to_close.add(c2pwrite)
|
||||
+ if stdout == PIPE:
|
||||
+ to_close.add(c2pread)
|
||||
|
||||
if stderr is None:
|
||||
errwrite = _subprocess.GetStdHandle(_subprocess.STD_ERROR_HANDLE)
|
||||
@@ -863,10 +866,14 @@ class Popen(object):
|
||||
# Assuming file-like object
|
||||
errwrite = msvcrt.get_osfhandle(stderr.fileno())
|
||||
errwrite = self._make_inheritable(errwrite)
|
||||
+ # We just duplicated the handle, it has to be closed at the end
|
||||
+ to_close.add(errwrite)
|
||||
+ if stderr == PIPE:
|
||||
+ to_close.add(errread)
|
||||
|
||||
return (p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
- errread, errwrite)
|
||||
+ errread, errwrite), to_close
|
||||
|
||||
|
||||
def _make_inheritable(self, handle):
|
||||
@@ -895,7 +902,7 @@ class Popen(object):
|
||||
|
||||
def _execute_child(self, args, executable, preexec_fn, close_fds,
|
||||
cwd, env, universal_newlines,
|
||||
- startupinfo, creationflags, shell,
|
||||
+ startupinfo, creationflags, shell, to_close,
|
||||
p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
errread, errwrite):
|
||||
@@ -934,6 +941,10 @@ class Popen(object):
|
||||
# kill children.
|
||||
creationflags |= _subprocess.CREATE_NEW_CONSOLE
|
||||
|
||||
+ def _close_in_parent(fd):
|
||||
+ fd.Close()
|
||||
+ to_close.remove(fd)
|
||||
+
|
||||
# Start the process
|
||||
try:
|
||||
hp, ht, pid, tid = _subprocess.CreateProcess(executable, args,
|
||||
@@ -958,11 +969,11 @@ class Popen(object):
|
||||
# pipe will not close when the child process exits and the
|
||||
# ReadFile will hang.
|
||||
if p2cread is not None:
|
||||
- p2cread.Close()
|
||||
+ _close_in_parent(p2cread)
|
||||
if c2pwrite is not None:
|
||||
- c2pwrite.Close()
|
||||
+ _close_in_parent(c2pwrite)
|
||||
if errwrite is not None:
|
||||
- errwrite.Close()
|
||||
+ _close_in_parent(errwrite)
|
||||
|
||||
# Retain the process handle, but close the thread handle
|
||||
self._child_created = True
|
||||
@@ -1088,6 +1099,7 @@ class Popen(object):
|
||||
"""Construct and return tuple with IO objects:
|
||||
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
|
||||
"""
|
||||
+ to_close = set()
|
||||
p2cread, p2cwrite = None, None
|
||||
c2pread, c2pwrite = None, None
|
||||
errread, errwrite = None, None
|
||||
@@ -1096,6 +1108,7 @@ class Popen(object):
|
||||
pass
|
||||
elif stdin == PIPE:
|
||||
p2cread, p2cwrite = self.pipe_cloexec()
|
||||
+ to_close.update((p2cread, p2cwrite))
|
||||
elif isinstance(stdin, int):
|
||||
p2cread = stdin
|
||||
else:
|
||||
@@ -1106,6 +1119,7 @@ class Popen(object):
|
||||
pass
|
||||
elif stdout == PIPE:
|
||||
c2pread, c2pwrite = self.pipe_cloexec()
|
||||
+ to_close.update((c2pread, c2pwrite))
|
||||
elif isinstance(stdout, int):
|
||||
c2pwrite = stdout
|
||||
else:
|
||||
@@ -1116,6 +1130,7 @@ class Popen(object):
|
||||
pass
|
||||
elif stderr == PIPE:
|
||||
errread, errwrite = self.pipe_cloexec()
|
||||
+ to_close.update((errread, errwrite))
|
||||
elif stderr == STDOUT:
|
||||
errwrite = c2pwrite
|
||||
elif isinstance(stderr, int):
|
||||
@@ -1126,7 +1141,7 @@ class Popen(object):
|
||||
|
||||
return (p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
- errread, errwrite)
|
||||
+ errread, errwrite), to_close
|
||||
|
||||
|
||||
def _set_cloexec_flag(self, fd, cloexec=True):
|
||||
@@ -1170,7 +1185,7 @@ class Popen(object):
|
||||
|
||||
def _execute_child(self, args, executable, preexec_fn, close_fds,
|
||||
cwd, env, universal_newlines,
|
||||
- startupinfo, creationflags, shell,
|
||||
+ startupinfo, creationflags, shell, to_close,
|
||||
p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
errread, errwrite):
|
||||
@@ -1189,6 +1204,10 @@ class Popen(object):
|
||||
if executable is None:
|
||||
executable = args[0]
|
||||
|
||||
+ def _close_in_parent(fd):
|
||||
+ os.close(fd)
|
||||
+ to_close.remove(fd)
|
||||
+
|
||||
# For transferring possible exec failure from child to parent
|
||||
# The first char specifies the exception type: 0 means
|
||||
# OSError, 1 means some other error.
|
||||
@@ -1283,17 +1302,17 @@ class Popen(object):
|
||||
# be sure the FD is closed no matter what
|
||||
os.close(errpipe_write)
|
||||
|
||||
- if p2cread is not None and p2cwrite is not None:
|
||||
- os.close(p2cread)
|
||||
- if c2pwrite is not None and c2pread is not None:
|
||||
- os.close(c2pwrite)
|
||||
- if errwrite is not None and errread is not None:
|
||||
- os.close(errwrite)
|
||||
-
|
||||
# Wait for exec to fail or succeed; possibly raising exception
|
||||
# Exception limited to 1M
|
||||
data = _eintr_retry_call(os.read, errpipe_read, 1048576)
|
||||
finally:
|
||||
+ if p2cread is not None and p2cwrite is not None:
|
||||
+ _close_in_parent(p2cread)
|
||||
+ if c2pwrite is not None and c2pread is not None:
|
||||
+ _close_in_parent(c2pwrite)
|
||||
+ if errwrite is not None and errread is not None:
|
||||
+ _close_in_parent(errwrite)
|
||||
+
|
||||
# be sure the FD is closed no matter what
|
||||
os.close(errpipe_read)
|
||||
|
||||
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
|
||||
--- a/Lib/test/test_subprocess.py
|
||||
+++ b/Lib/test/test_subprocess.py
|
||||
@@ -14,6 +14,10 @@ try:
|
||||
import resource
|
||||
except ImportError:
|
||||
resource = None
|
||||
+try:
|
||||
+ import threading
|
||||
+except ImportError:
|
||||
+ threading = None
|
||||
|
||||
mswindows = (sys.platform == "win32")
|
||||
|
||||
@@ -629,6 +633,36 @@ class ProcessTestCase(BaseTestCase):
|
||||
if c.exception.errno not in (errno.ENOENT, errno.EACCES):
|
||||
raise c.exception
|
||||
|
||||
+ @unittest.skipIf(threading is None, "threading required")
|
||||
+ def test_double_close_on_error(self):
|
||||
+ # Issue #18851
|
||||
+ fds = []
|
||||
+ def open_fds():
|
||||
+ for i in range(20):
|
||||
+ fds.extend(os.pipe())
|
||||
+ time.sleep(0.001)
|
||||
+ t = threading.Thread(target=open_fds)
|
||||
+ t.start()
|
||||
+ try:
|
||||
+ with self.assertRaises(EnvironmentError):
|
||||
+ subprocess.Popen(['nonexisting_i_hope'],
|
||||
+ stdin=subprocess.PIPE,
|
||||
+ stdout=subprocess.PIPE,
|
||||
+ stderr=subprocess.PIPE)
|
||||
+ finally:
|
||||
+ t.join()
|
||||
+ exc = None
|
||||
+ for fd in fds:
|
||||
+ # If a double close occurred, some of those fds will
|
||||
+ # already have been closed by mistake, and os.close()
|
||||
+ # here will raise.
|
||||
+ try:
|
||||
+ os.close(fd)
|
||||
+ except OSError as e:
|
||||
+ exc = e
|
||||
+ if exc is not None:
|
||||
+ raise exc
|
||||
+
|
||||
def test_handles_closed_on_exception(self):
|
||||
# If CreateProcess exits with an error, ensure the
|
||||
# duplicate output handles are released
|
||||
@@ -783,7 +817,7 @@ class POSIXProcessTestCase(BaseTestCase)
|
||||
|
||||
def _execute_child(
|
||||
self, args, executable, preexec_fn, close_fds, cwd, env,
|
||||
- universal_newlines, startupinfo, creationflags, shell,
|
||||
+ universal_newlines, startupinfo, creationflags, shell, to_close,
|
||||
p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
errread, errwrite):
|
||||
@@ -791,7 +825,7 @@ class POSIXProcessTestCase(BaseTestCase)
|
||||
subprocess.Popen._execute_child(
|
||||
self, args, executable, preexec_fn, close_fds,
|
||||
cwd, env, universal_newlines,
|
||||
- startupinfo, creationflags, shell,
|
||||
+ startupinfo, creationflags, shell, to_close,
|
||||
p2cread, p2cwrite,
|
||||
c2pread, c2pwrite,
|
||||
errread, errwrite)
|
||||
@ -0,0 +1,350 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.5-r4.ebuild,v 1.1 2013/10/26 15:11:20 floppym Exp $
|
||||
|
||||
EAPI="4"
|
||||
WANT_AUTOMAKE="none"
|
||||
WANT_LIBTOOL="none"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
|
||||
|
||||
MY_P="Python-${PV}"
|
||||
PATCHSET_REVISION="0"
|
||||
|
||||
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
|
||||
HOMEPAGE="http://www.python.org/"
|
||||
SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
|
||||
mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz"
|
||||
|
||||
LICENSE="PSF-2"
|
||||
SLOT="2.7"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
|
||||
|
||||
# Do not add a dependency on dev-lang/python to this ebuild.
|
||||
# If you need to apply a patch which requires python for bootstrapping, please
|
||||
# run the bootstrap code on your dev box and include the results in the
|
||||
# patchset. See bug 447752.
|
||||
|
||||
RDEPEND="app-arch/bzip2
|
||||
>=sys-libs/zlib-1.1.3
|
||||
virtual/libffi
|
||||
virtual/libintl
|
||||
!build? (
|
||||
berkdb? ( || (
|
||||
sys-libs/db:5.3
|
||||
sys-libs/db:5.2
|
||||
sys-libs/db:5.1
|
||||
sys-libs/db:5.0
|
||||
sys-libs/db:4.8
|
||||
sys-libs/db:4.7
|
||||
sys-libs/db:4.6
|
||||
sys-libs/db:4.5
|
||||
sys-libs/db:4.4
|
||||
sys-libs/db:4.3
|
||||
sys-libs/db:4.2
|
||||
) )
|
||||
gdbm? ( sys-libs/gdbm[berkdb] )
|
||||
ncurses? (
|
||||
>=sys-libs/ncurses-5.2
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
)
|
||||
sqlite? ( >=dev-db/sqlite-3.3.8:3 )
|
||||
ssl? ( dev-libs/openssl )
|
||||
tk? (
|
||||
>=dev-lang/tk-8.0
|
||||
dev-tcltk/blt
|
||||
)
|
||||
xml? ( >=dev-libs/expat-2.1 )
|
||||
)
|
||||
!!<sys-apps/portage-2.1.9"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
>=sys-devel/autoconf-2.65
|
||||
!sys-devel/gcc[libffi]"
|
||||
RDEPEND+=" !build? ( app-misc/mime-types )
|
||||
doc? ( dev-python/python-docs:${SLOT} )"
|
||||
PDEPEND="app-admin/eselect-python
|
||||
app-admin/python-updater"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
if use berkdb; then
|
||||
ewarn "'bsddb' module is out-of-date and no longer maintained inside"
|
||||
ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
|
||||
ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
|
||||
ewarn "is provided by dev-python/bsddb3."
|
||||
else
|
||||
if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
|
||||
ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
|
||||
ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
|
||||
ewarn "You might need to migrate your databases."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Ensure that internal copies of expat, libffi and zlib are not used.
|
||||
rm -r Modules/expat || die
|
||||
rm -r Modules/_ctypes/libffi* || die
|
||||
rm -r Modules/zlib || die
|
||||
|
||||
if tc-is-cross-compiler; then
|
||||
local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
|
||||
fi
|
||||
|
||||
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
|
||||
|
||||
epatch "${FILESDIR}/${P}-library-path.patch" #474882
|
||||
epatch "${FILESDIR}/${P}-re_unsigned_ptrdiff.patch" #476426
|
||||
epatch "${FILESDIR}/CVE-2013-4238_py27.patch"
|
||||
epatch "${FILESDIR}/python-2.7-issue16248.patch"
|
||||
epatch "${FILESDIR}/python-2.7-issue18851.patch"
|
||||
|
||||
# Fix for cross-compiling.
|
||||
epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
|
||||
|
||||
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
|
||||
Lib/distutils/command/install.py \
|
||||
Lib/distutils/sysconfig.py \
|
||||
Lib/site.py \
|
||||
Lib/sysconfig.py \
|
||||
Lib/test/test_site.py \
|
||||
Makefile.pre.in \
|
||||
Modules/Setup.dist \
|
||||
Modules/getpath.c \
|
||||
setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
|
||||
|
||||
epatch_user
|
||||
|
||||
eautoconf
|
||||
eautoheader
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use build; then
|
||||
# Disable extraneous modules with extra dependencies.
|
||||
export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
|
||||
export PYTHON_DISABLE_SSL="1"
|
||||
else
|
||||
# dbm module can be linked against berkdb or gdbm.
|
||||
# Defaults to gdbm when both are enabled, #204343.
|
||||
local disable
|
||||
use berkdb || use gdbm || disable+=" dbm"
|
||||
use berkdb || disable+=" _bsddb"
|
||||
use gdbm || disable+=" gdbm"
|
||||
use ncurses || disable+=" _curses _curses_panel"
|
||||
use readline || disable+=" readline"
|
||||
use sqlite || disable+=" _sqlite3"
|
||||
use ssl || export PYTHON_DISABLE_SSL="1"
|
||||
use tk || disable+=" _tkinter"
|
||||
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
|
||||
export PYTHON_DISABLE_MODULES="${disable}"
|
||||
|
||||
if ! use xml; then
|
||||
ewarn "You have configured Python without XML support."
|
||||
ewarn "This is NOT a recommended configuration as you"
|
||||
ewarn "may face problems parsing any XML documents."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
|
||||
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
|
||||
fi
|
||||
|
||||
if [[ "$(gcc-major-version)" -ge 4 ]]; then
|
||||
append-flags -fwrapv
|
||||
fi
|
||||
|
||||
filter-flags -malign-double
|
||||
|
||||
[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
|
||||
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=50309
|
||||
if is-flagq -O3; then
|
||||
is-flagq -fstack-protector-all && replace-flags -O3 -O2
|
||||
use hardened && replace-flags -O3 -O2
|
||||
fi
|
||||
|
||||
# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
|
||||
tc-export CXX
|
||||
# The configure script fails to use pkg-config correctly.
|
||||
# http://bugs.python.org/issue15506
|
||||
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
|
||||
|
||||
# Set LDFLAGS so we link modules with -lpython2.7 correctly.
|
||||
# Needed on FreeBSD unless Python 2.7 is already installed.
|
||||
# Please query BSD team before removing this!
|
||||
append-ldflags "-L."
|
||||
|
||||
local dbmliborder
|
||||
if use gdbm; then
|
||||
dbmliborder+="${dbmliborder:+:}gdbm"
|
||||
fi
|
||||
if use berkdb; then
|
||||
dbmliborder+="${dbmliborder:+:}bdb"
|
||||
fi
|
||||
|
||||
BUILD_DIR="${WORKDIR}/${CHOST}"
|
||||
mkdir -p "${BUILD_DIR}" || die
|
||||
cd "${BUILD_DIR}" || die
|
||||
|
||||
ECONF_SOURCE="${S}" OPT="" \
|
||||
econf \
|
||||
--with-fpectl \
|
||||
--enable-shared \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with threads) \
|
||||
$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
|
||||
--infodir='${prefix}/share/info' \
|
||||
--mandir='${prefix}/share/man' \
|
||||
--with-dbmliborder="${dbmliborder}" \
|
||||
--with-libc="" \
|
||||
--enable-loadable-sqlite-extensions \
|
||||
--with-system-expat \
|
||||
--with-system-ffi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Avoid invoking pgen for cross-compiles.
|
||||
touch Include/graminit.h Python/graminit.c
|
||||
|
||||
cd "${BUILD_DIR}" || die
|
||||
emake
|
||||
|
||||
# Work around bug 329499. See also bug 413751 and 457194.
|
||||
if has_version dev-libs/libffi[pax_kernel]; then
|
||||
pax-mark E python
|
||||
else
|
||||
pax-mark m python
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Tests will not work when cross compiling.
|
||||
if tc-is-cross-compiler; then
|
||||
elog "Disabling tests due to crosscompiling."
|
||||
return
|
||||
fi
|
||||
|
||||
cd "${BUILD_DIR}" || die
|
||||
|
||||
# Skip failing tests.
|
||||
local skipped_tests="distutils gdb"
|
||||
|
||||
for test in ${skipped_tests}; do
|
||||
mv "${S}"/Lib/test/test_${test}.py "${T}"
|
||||
done
|
||||
|
||||
# Rerun failed tests in verbose mode (regrtest -w).
|
||||
emake test EXTRATESTOPTS="-w" < /dev/tty
|
||||
local result="$?"
|
||||
|
||||
for test in ${skipped_tests}; do
|
||||
mv "${T}/test_${test}.py" "${S}"/Lib/test
|
||||
done
|
||||
|
||||
elog "The following tests have been skipped:"
|
||||
for test in ${skipped_tests}; do
|
||||
elog "test_${test}.py"
|
||||
done
|
||||
|
||||
elog "If you would like to run them, you may:"
|
||||
elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
|
||||
elog "and run the tests separately."
|
||||
|
||||
if [[ "${result}" -ne 0 ]]; then
|
||||
die "emake test failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
|
||||
|
||||
cd "${BUILD_DIR}" || die
|
||||
emake DESTDIR="${D}" altinstall
|
||||
|
||||
sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
|
||||
|
||||
# Backwards compat with Gentoo divergence.
|
||||
dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
|
||||
|
||||
# Fix collisions between different slots of Python.
|
||||
mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
|
||||
mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
|
||||
mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
|
||||
rm -f "${ED}usr/bin/smtpd.py"
|
||||
|
||||
if use build; then
|
||||
rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
|
||||
else
|
||||
use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
|
||||
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
|
||||
use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
|
||||
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
|
||||
fi
|
||||
|
||||
use threads || rm -r "${libdir}/multiprocessing" || die
|
||||
use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
|
||||
|
||||
dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins -r "${S}"/Tools
|
||||
fi
|
||||
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
|
||||
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
|
||||
emake --no-print-directory -s -f - 2>/dev/null)
|
||||
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
|
||||
|
||||
newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
|
||||
newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
|
||||
sed \
|
||||
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
|
||||
-e "s:@PYDOC@:pydoc${SLOT}:" \
|
||||
-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
|
||||
|
||||
# for python-exec
|
||||
python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
|
||||
|
||||
# if not using a cross-compiler, use the fresh binary
|
||||
if ! tc-is-cross-compiler; then
|
||||
local PYTHON=./python
|
||||
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
|
||||
fi
|
||||
|
||||
echo "EPYTHON='${EPYTHON}'" > epython.py
|
||||
python_domodule epython.py
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
|
||||
python_updater_warning="1"
|
||||
fi
|
||||
}
|
||||
|
||||
eselect_python_update() {
|
||||
if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
|
||||
eselect python update
|
||||
fi
|
||||
|
||||
if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
|
||||
eselect python update --python${PV%%.*}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect_python_update
|
||||
|
||||
if [[ "${python_updater_warning}" == "1" ]]; then
|
||||
ewarn "You have just upgraded from an older version of Python."
|
||||
ewarn "You should switch active version of Python ${PV%%.*} and run"
|
||||
ewarn "'python-updater [options]' to rebuild Python modules."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect_python_update
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST hidapi-0.8.0_pre20130121.tar.xz 257900 SHA256 70440f658dbf1f840647d0756e230fdfe479fd4980d3ba7b299715b1947a8916 SHA512 6735112cae24c845bf5ec1fc04c1cafc12c31a1ec5f8d560fd8089f1abf9b1f4aca2c027b1103b7154f698334d7f9ee8f5e72eb5571ecce5abf3fe716ca68096 WHIRLPOOL 94a691cbeafedd93ac786202f8acb2e4d1a6433cc379c9f7de792c0e1f881b34339df43289804105511f634b26144720e22377a37f1ac1c202a81907a988c773
|
||||
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/hidapi/hidapi-0.8.0_pre20130121.ebuild,v 1.1 2013/10/27 15:30:57 blueness Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools eutils #git-2
|
||||
|
||||
# If github is desired, the following may be used.
|
||||
#EGIT_REPO_URI="git://github.com/signal11/hidapi.git"
|
||||
#EGIT_BRANCH="master"
|
||||
#EGIT_COMMIT="119135b8ce0e8db668ec171723d6e56d4394166a"
|
||||
|
||||
DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
|
||||
HOMEPAGE="http://www.signal11.us/oss/hidapi/"
|
||||
SRC_URI="http://public.callutheran.edu/~abarker/${P}.tar.xz"
|
||||
# When 0.8.0 is officially available the following link should be used.
|
||||
#SRC_URI="mirror://github/signal11/${PN}/${P}.zip"
|
||||
|
||||
LICENSE="|| ( BSD GPL-3 HIDAPI )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc static-libs X"
|
||||
|
||||
# S is only needed for the pre_package
|
||||
S=${WORKDIR}/${PN}
|
||||
RDEPEND="virtual/libusb:0"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-doc/doxygen )
|
||||
virtual/pkgconfig
|
||||
X? ( x11-libs/fox )"
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable X testgui)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use doc; then
|
||||
doxygen doxygen/Doxyfile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if use doc; then
|
||||
dohtml -r html/*
|
||||
fi
|
||||
|
||||
prune_libtool_files
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue