Sync with portage [Sun Feb 14 21:40:58 MSK 2016].

mhiretskiy 229
root 8 years ago
parent 85babdd98a
commit 2a31e7df0e

@ -1,3 +1,2 @@
DIST conky-1.10.0.tar.gz 342584 SHA256 f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb SHA512 08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf WHIRLPOOL 03f8f80b483c8db09096a10a8d95b20372cbd5fb3e284b9bcd072c4ec1a2a4f76335eb5e8016a3e6793f295c143c71268e65fb5e50fdea0b3e6ce187830a6c46
DIST conky-1.10.1.tar.gz 343393 SHA256 b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21 SHA512 bcd3efa722fcd1d264157843fac0e9c5e5e0aa881f38b676cb1634efe57c3f07c535f063c0c9eba7bcd5deebf7b8e87099856fc5092cd01955c09b70e155cfd2 WHIRLPOOL 40ab9ecb135e15674a139aef5f98a8e229b38de995b0af7646813a422562b60566ed6125dad376560550e59d9b17f85f755c3f85034c78c6e02f857c966f4d26
DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a

@ -1,183 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils cmake-utils linux-info
DESCRIPTION="An advanced, highly configurable system monitor for X"
HOMEPAGE="https://github.com/brndnmtthws/conky"
SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar
weather-xoap webserver wifi X xmms2"
DEPEND_COMMON="
X? (
imlib? ( media-libs/imlib2[X] )
lua-cairo? (
>=dev-lua/toluapp-1.0.93
x11-libs/cairo[X] )
lua-imlib? (
>=dev-lua/toluapp-1.0.93
media-libs/imlib2[X] )
lua-rsvg? (
>=dev-lua/toluapp-1.0.93
gnome-base/librsvg )
nvidia? ( media-video/nvidia-settings )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
x11-libs/libX11
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libXext
audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
xmms2? ( media-sound/xmms2 )
)
cmus? ( media-sound/cmus )
curl? ( net-misc/curl )
eve? ( net-misc/curl dev-libs/libxml2 )
ical? ( dev-libs/libical )
iconv? ( virtual/libiconv )
irc? ( net-libs/libircclient )
mysql? ( >=virtual/mysql-5.0 )
ncurses? ( sys-libs/ncurses:= )
rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
wifi? ( net-wireless/wireless-tools )
weather-metar? ( net-misc/curl )
weather-xoap? ( dev-libs/libxml2 net-misc/curl )
webserver? ( net-libs/libmicrohttpd )
>=dev-lang/lua-5.1.4-r8:0
"
RDEPEND="
${DEPEND_COMMON}
apcupsd? ( sys-power/apcupsd )
hddtemp? ( app-admin/hddtemp )
moc? ( media-sound/moc )
nano-syntax? ( app-editors/nano )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
DEPEND="
${DEPEND_COMMON}
app-text/docbook2X
"
CONFIG_CHECK=~IPV6
DOCS=( README TODO ChangeLog NEWS AUTHORS )
pkg_setup() {
use ipv6 && linux-info_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/${P}-cmake.patch"
epatch "${FILESDIR}/${P}-includefiles.patch"
# Allow user patches #478482
epatch_user
}
src_configure() {
local mycmakeargs
if use X; then
mycmakeargs=(
-DBUILD_X11=ON
-DOWN_WINDOW=ON
-DBUILD_XDAMAGE=ON
-DBUILD_XDBE=ON
$(cmake-utils_use_build truetype XFT)
$(cmake-utils_use_build imlib IMLIB2)
-DBUILD_XSHAPE=ON
-DBUILD_ARGB=ON
$(cmake-utils_use_build lua-cairo LUA_CAIRO)
$(cmake-utils_use_build lua-imlib LUA_IMLIB2)
$(cmake-utils_use_build lua-rsvg LUA_RSVG)
$(cmake-utils_use_build nvidia)
$(cmake-utils_use_build audacious)
$(cmake-utils_use_build xmms2)
)
else
mycmakeargs=(
-DBUILD_X11=OFF
-DBUILD_NVIDIA=OFF
-DBUILD_LUA_CAIRO=OFF
-DBUILD_LUA_IMLIB2=OFF
-DBUILD_LUA_RSVG=OFF
-DBUILD_AUDACIOUS=OFF
-DBUILD_XMMS2=OFF
)
fi
mycmakeargs+=(
$(cmake-utils_use_build apcupsd)
$(cmake-utils_use_build debug)
$(cmake-utils_use_build cmus)
$(cmake-utils_use_build curl)
$(cmake-utils_use_build eve)
$(cmake-utils_use_build hddtemp)
$(cmake-utils_use_build iostats)
$(cmake-utils_use_build ical)
$(cmake-utils_use_build iconv)
$(cmake-utils_use_build ipv6)
$(cmake-utils_use_build irc)
$(cmake-utils_use_build math)
$(cmake-utils_use_build moc)
$(cmake-utils_use_build mpd)
$(cmake-utils_use_build mysql)
$(cmake-utils_use_build ncurses)
$(cmake-utils_use_build portmon PORT_MONITORS)
$(cmake-utils_use_build rss)
$(cmake-utils_use_build thinkpad IBM)
$(cmake-utils_use_build weather-metar WEATHER_METAR)
$(cmake-utils_use_build weather-xoap WEATHER_XOAP)
$(cmake-utils_use_build webserver HTTP)
$(cmake-utils_use_build wifi WLAN)
-DBUILD_BUILTIN_CONFIG=ON
-DBUILD_OLD_CONFIG=ON
-DBUILD_I18N=ON
-DMAINTAINER_MODE=ON
-DBUILD_AUDACIOUS_LEGACY=OFF
-DBUILD_BMPX=OFF
-DDOC_PATH=/usr/share/doc/${PF}
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/ftdetect
doins "${S}"/extras/vim/ftdetect/conkyrc.vim
insinto /usr/share/vim/vimfiles/syntax
doins "${S}"/extras/vim/syntax/conkyrc.vim
fi
if use nano-syntax; then
insinto /usr/share/nano/
doins "${S}"/extras/nano/conky.nanorc
fi
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf"
elog "and edit it to your liking."
elog
elog "There are pretty html docs available at the conky homepage"
elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
elog
elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
elog
fi
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -30,7 +30,7 @@ DEPEND_COMMON="
lua-rsvg? (
>=dev-lua/toluapp-1.0.93
gnome-base/librsvg )
nvidia? ( media-video/nvidia-settings )
nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
x11-libs/libX11
x11-libs/libXdamage

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
RDEPEND+=">=virtual/jdk-1.7.0"
DEPEND+=""

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
IUSE="libressl ssl static +tools"
DEPEND="sys-devel/automake

@ -1 +1,2 @@
DIST mt-st-1.1.tar.gz 35749 SHA256 945cb4f3d9957dabe768f5941a9148b746396836c797b25f020c84319ba8170d SHA512 5fd11c430219c9c2d98f7567433a59c689e6f1bf9a2aaa13eb8df58569c1d70417965a4a62b5c9d0fc7e4e520ecb8d745911d18c3e2652c6aaedb94850743fdb WHIRLPOOL 17f76ec85a0506bd7973cf3733ef091eb63f422cdf0057c11582f675e08d6aca1f531bbc824d4d4f8950431bbc87e246e90024f0b1f2ee43549802b56e7e31f8
DIST mt-st-1.2.tar.gz 34186 SHA256 b2bb1b78fb562672d0deaff6120edb019da7c06950cb90cbcc07d97c767958cd SHA512 3565f9364f25e91350b6fdbc26f3843c86d7ad831d5575bc8e0c0dd985f9ab8e4677c3d112c9967408babe22f79058507d89ef7c593f83aafe78036105cf535c WHIRLPOOL 397023409f38b5d82983688fdbfefd692bc7b5bb99158f1abb98a5a7ac9f4b47cc43bf61392b36905e81e331c1ab35f470c552555e86c322de5de9a945d31214

@ -0,0 +1,25 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
inherit eutils toolchain-funcs
DESCRIPTION="control magnetic tape drive operation"
HOMEPAGE="https://github.com/iustin/mt-st"
SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
}
src_install() {
dosbin mt stinit
doman mt.1 stinit.8
dodoc README* stinit.def.examples
}

@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
fi

@ -0,0 +1,66 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools flag-o-matic
DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
HOMEPAGE="http://cdrdao.sourceforge.net/"
if [[ ${PV/*_rc*} ]]
then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
else
SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
fi
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="gcdmaster encode mad vorbis"
RDEPEND="virtual/cdrtools
encode? ( >=media-sound/lame-3.99 )
gcdmaster? (
>=dev-libs/libsigc++-2.6:2
>=dev-cpp/gtkmm-2.4:2.4
>=dev-cpp/libgnomeuimm-2.6:2.6
media-libs/libao
)
mad? (
media-libs/libmad
media-libs/libao
)
vorbis? (
media-libs/libvorbis
media-libs/libao
)
!app-cdr/cue2toc
!dev-util/pccts"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-glibc212.patch"
"${FILESDIR}/${P}-unsigned-char.patch"
"${FILESDIR}/${P}-ax_pthread.patch"
"${FILESDIR}/${P}-wformat-security.patch"
)
S=${WORKDIR}/${P/_}
src_prepare() {
default
eautoreconf
}
src_configure() {
# Fix building with latest libsigc++
append-cxxflags -std=c++11
find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
econf \
$(use_with gcdmaster xdao) \
$(use_with vorbis ogg-support) \
$(use_with mad mp3-support) \
$(use_with encode lame)
}

@ -0,0 +1,418 @@
Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
to CFLAGS, CXXFLAGS and LIBS.
Also use AM_PROG_AR to detect proper ar
See also: https://bugs.gentoo.org/show_bug.cgi?id=548004
--- cdrdao-1.2.3/configure.ac
+++ cdrdao-1.2.3/configure.ac
@@ -2,6 +2,7 @@
AC_REVISION($Revision: 1.25 $)dnl
AC_INIT(cdrdao, 1.2.3)
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(dao/main.cc)
AM_INIT_AUTOMAKE
@@ -32,7 +33,7 @@
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_RANLIB
-AC_CHECK_PROG(AR,ar,ar)
+AM_PROG_AR
AC_PROG_MAKE_SET
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
@@ -113,7 +114,10 @@
fi
if test "$use_pthreads" = yes; then
- AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
+ AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
+ LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
if test "$have_pthread_std" = yes; then
AC_DEFINE(USE_POSIX_THREADS,1,"")
--- cdrdao-1.2.3/m4/ax_pthread.m4
+++ cdrdao-1.2.3/m4/ax_pthread.m4
@@ -0,0 +1,332 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+# This macro figures out how to build C programs using POSIX threads. It
+# sets the PTHREAD_LIBS output variable to the threads library and linker
+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+# flags that are needed. (The user can also force certain compiler
+# flags/libs to be tested by setting these environment variables.)
+#
+# Also sets PTHREAD_CC to any special C compiler that is needed for
+# multi-threaded programs (defaults to the value of CC otherwise). (This
+# is necessary on AIX to use the special cc_r compiler alias.)
+#
+# NOTE: You are assumed to not only compile your program with these flags,
+# but also link it with them as well. e.g. you should link with
+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+# If you are only building threads programs, you may wish to use these
+# variables in your default LIBS, CFLAGS, and CC:
+#
+# LIBS="$PTHREAD_LIBS $LIBS"
+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+# CC="$PTHREAD_CC"
+#
+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+# PTHREAD_CFLAGS.
+#
+# ACTION-IF-FOUND is a list of shell commands to run if a threads library
+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+# is not found. If ACTION-IF-FOUND is not specified, the default action
+# will define HAVE_PTHREAD.
+#
+# Please let the authors know if this macro fails on any platform, or if
+# you have any other suggestions or comments. This macro was based on work
+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+# Alejandro Forero Cuervo to the autoconf macro repository. We are also
+# grateful for the helpful feedback of numerous users.
+#
+# Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 21
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
+ AC_MSG_RESULT([$ax_pthread_ok])
+ if test x"$ax_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+ solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+ ;;
+
+ darwin*)
+ ax_pthread_flags="-pthread $ax_pthread_flags"
+ ;;
+esac
+
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.
+
+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
+ [AC_MSG_RESULT([yes])],
+ [ax_pthread_extra_flags=
+ AC_MSG_RESULT([no])])
+CFLAGS="$save_CFLAGS"
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ pthread-config)
+ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+ if test x"$ax_pthread_config" = xno; then continue; fi
+ PTHREAD_CFLAGS="`pthread-config --cflags`"
+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+ static void routine(void *a) { a = 0; }
+ static void *start_routine(void *a) { return a; }],
+ [pthread_t th; pthread_attr_t attr;
+ pthread_create(&th, 0, start_routine, 0);
+ pthread_join(th, 0);
+ pthread_attr_init(&attr);
+ pthread_cleanup_push(routine, 0);
+ pthread_cleanup_pop(0) /* ; */])],
+ [ax_pthread_ok=yes],
+ [])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT([$ax_pthread_ok])
+ if test "x$ax_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ attr_name=unknown
+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+ [int attr = $attr; return attr /* ; */])],
+ [attr_name=$attr; break],
+ [])
+ done
+ AC_MSG_RESULT([$attr_name])
+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
+ [Define to necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case ${host_os} in
+ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+ osf* | hpux*) flag="-D_REENTRANT";;
+ solaris*)
+ if test "$GCC" = "yes"; then
+ flag="-D_REENTRANT"
+ else
+ # TODO: What about Clang on Solaris?
+ flag="-mt -D_REENTRANT"
+ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$flag])
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+ [ax_cv_PTHREAD_PRIO_INHERIT], [
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+ [[int i = PTHREAD_PRIO_INHERIT;]])],
+ [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+ [ax_cv_PTHREAD_PRIO_INHERIT=no])
+ ])
+ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ # More AIX lossage: compile with *_r variant
+ if test "x$GCC" != xyes; then
+ case $host_os in
+ aix*)
+ AS_CASE(["x/$CC"],
+ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+ [#handle absolute path differently from PATH based program lookup
+ AS_CASE(["x$CC"],
+ [x/*],
+ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+ ;;
+ esac
+ fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+ :
+else
+ ax_pthread_ok=no
+ $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
--- cdrdao-1.2.3/m4/gconf-2.m4
+++ cdrdao-1.2.3/m4/gconf-2.m4
@@ -0,0 +1,44 @@
+dnl AM_GCONF_SOURCE_2
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+dnl (i.e. pass to gconftool-2
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+dnl you should install foo.schemas files
+dnl
+
+AC_DEFUN([AM_GCONF_SOURCE_2],
+[
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ else
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+ fi
+
+ AC_ARG_WITH([gconf-source],
+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
+ [Config database for installing schema files.]),
+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ fi
+
+ AC_ARG_WITH([gconf-schema-file-dir],
+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+ [Directory for installing schema files.]),
+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+ AC_ARG_ENABLE(schemas-install,
+ AC_HELP_STRING([--disable-schemas-install],
+ [Disable the schemas installation]),
+ [case ${enableval} in
+ yes|no) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+ esac])
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])

@ -1,7 +1,7 @@
http://bugs.gentoo.org/332237
--- dao/ScsiIf-linux.cc
+++ dao/ScsiIf-linux.cc
--- cdrdao-1.2.3/dao/ScsiIf-linux.cc
+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc
@@ -30,6 +30,7 @@
#include <asm/param.h>
#include <scsi/scsi.h>

@ -0,0 +1,173 @@
Fix -Werror=format-security errors
Also fix incorrect printf() format specifiers
https://bugs.gentoo.org/show_bug.cgi?id=520988
* gen.c: In function 'genHdr':
* gen.c:3869:17: error: format not a string literal and no format arguments [-Werror=format-security]
--- cdrdao-1.2.3/pccts/antlr/bits.c
+++ cdrdao-1.2.3/pccts/antlr/bits.c
@@ -574,13 +574,13 @@
else
fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
if ( name!=NULL ) {
- fprintf(ErrFile, "SetWordType %s%s[%d] = {",
+ fprintf(ErrFile, "SetWordType %s%s[%lu] = {",
name,
suffix,
NumWords(TokenNum-1)*sizeof(unsigned));
}
else {
- fprintf(ErrFile, "SetWordType zzerr%d[%d] = {",
+ fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {",
esetnum,
NumWords(TokenNum-1)*sizeof(unsigned));
}
@@ -642,20 +642,20 @@
esetnum++;
if ( name!=NULL ) {
- fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix,
+ fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix,
NumWords(TokenNum-1)*sizeof(unsigned));
- fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {",
+ fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {",
CurrentClassName,
name,
suffix,
NumWords(TokenNum-1)*sizeof(unsigned));
}
else {
- fprintf(Parser_c, "SetWordType %s::err%d[%d] = {",
+ fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {",
CurrentClassName,
esetnum,
NumWords(TokenNum-1)*sizeof(unsigned));
- fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum,
+ fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum,
NumWords(TokenNum-1)*sizeof(unsigned));
}
@@ -788,7 +788,7 @@
/* Build constructors */
fprintf(Parser_c, "\n%s::", CurrentClassName);
- fprintf(Parser_c, "%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n",
+ fprintf(Parser_c, "%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n",
CurrentClassName,
(BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
OutputLL_k,
@@ -913,7 +913,7 @@
#ifdef DUM
if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
#endif
- fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
+ fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
fprintf(ErrFile, "#include \"antlr.h\"\n");
if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");
--- cdrdao-1.2.3/pccts/antlr/fset2.c
+++ cdrdao-1.2.3/pccts/antlr/fset2.c
@@ -2210,7 +2210,7 @@
if (p->ntype != nToken) continue;
tn=(TokNode *)p;
if (depth != 0) fprintf(stdout," ");
- fprintf(stdout,TerminalString(tn->token));
+ fprintf(stdout,"%s",TerminalString(tn->token));
depth++;
if (! MR_AmbAidMultiple) {
if (set_nil(tn->tset)) {
--- cdrdao-1.2.3/pccts/antlr/gen.c
+++ cdrdao-1.2.3/pccts/antlr/gen.c
@@ -159,7 +159,7 @@
#define gen6(s,a,b,c,d,e,f) {tab(); fprintf(output, s,a,b,c,d,e,f);}
#define gen7(s,a,b,c,d,e,f,g) {tab(); fprintf(output, s,a,b,c,d,e,f,g);}
-#define _gen(s) {fprintf(output, s);}
+#define _gen(s) {fprintf(output, "%s", s);}
#define _gen1(s,a) {fprintf(output, s,a);}
#define _gen2(s,a,b) {fprintf(output, s,a,b);}
#define _gen3(s,a,b,c) {fprintf(output, s,a,b,c);}
@@ -3911,7 +3911,7 @@
}
#endif
/* ###WARNING: This will have to change when SetWordSize changes */
- if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
+ if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
if (TraceGen) {
_gen("#ifndef zzTRACE_RULES\n"); /* MR20 */
_gen("#define zzTRACE_RULES\n"); /* MR20 */
@@ -4125,7 +4125,7 @@
if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
#endif
/* ###WARNING: This will have to change when SetWordSize changes */
- fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
+ fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
if (TraceGen) {
fprintf(f,"#ifndef zzTRACE_RULES\n"); /* MR20 */
fprintf(f,"#define zzTRACE_RULES\n"); /* MR20 */
--- cdrdao-1.2.3/pccts/antlr/lex.c
+++ cdrdao-1.2.3/pccts/antlr/lex.c
@@ -706,7 +706,7 @@
/* MR26 */ if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break;
/* MR26 */ }
/* MR26 */ }
-/* MR26 */ fprintf(output,strBetween(pSymbol, t, pSeparator));
+/* MR26 */ fprintf(output,"%s",strBetween(pSymbol, t, pSeparator));
*q = p;
return (*pSeparator == 0);
@@ -771,7 +771,7 @@
&pValue,
&pSeparator,
&nest);
- fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
+ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
}
/* check to see if string e is a word in string s */
@@ -852,9 +852,9 @@
&pSeparator,
&nest);
fprintf(f,"\t");
- fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
+ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
fprintf(f," ");
- fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator));
+ fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator));
fprintf(f,";\n");
}
fprintf(f,"};\n");
--- cdrdao-1.2.3/pccts/antlr/set.c
+++ cdrdao-1.2.3/pccts/antlr/set.c
@@ -263,7 +263,7 @@
static set a;
if ( b == nil ) return( empty );
- set_new(a, b);
+ set_new(a, (long unsigned int) b);
a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
return(a);
--- cdrdao-1.2.3/pccts/dlg/set.c
+++ cdrdao-1.2.3/pccts/dlg/set.c
@@ -263,7 +263,7 @@
static set a;
if ( b == nil ) return( empty );
- set_new(a, b);
+ set_new(a, (long unsigned int) b);
a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
return(a);
--- cdrdao-1.2.3/pccts/h/set.h
+++ cdrdao-1.2.3/pccts/h/set.h
@@ -55,7 +55,7 @@
/* make arg1 a set big enough to hold max elem # of arg2 */
#define set_new(a,_max) \
if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \
- fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \
+ fprintf(stderr, "set_new: Cannot allocate set with max of %lu\n", _max); \
(a).n = NumWords(_max);
#define set_free(a) \

@ -1,4 +1,4 @@
DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
DIST cdrtools-3.02a02.tar.bz2 2096499 SHA256 b5c33d6cfbe265806f24f365bdb885dfe35194ef716f4b6f809b4377ec159c05 SHA512 f61241006464b7055994ee040ec498e4cd47254501e55ea1e570a7ebc9db1422b46b47398373f7227904bcf6cc785fa1c8ae913cbb297cf839250ceccea18330 WHIRLPOOL 757c80f9b05697f0479edea61b74d2bc2c945f292fcef04ab3a41dda14d096881751d0e9b796b8ad73e227336a295c97182a91e37c48372718440509bbc2bfb7
DIST cdrtools-3.02a05.tar.bz2 2115386 SHA256 4c79ae080c334854ee8ea04a2e36e15f15709d8c3da2df22e818ab91639b6bba SHA512 86dadff90da5a90340d6c0f06367d0285e180fddc98fd009b8d18b67c6d81895359ee9293c38036ccfbbf479e8ea73225da8149dffb4cddb919c85226a63ddea WHIRLPOOL c5b9b9e694b1e69d0bd172d6976ac7c55cf1864d7eb32f86d867d6f75cad5eb971efd11056274790551eb24fbb0d500edaf7dd1e50c90cf9534b441226360723
DIST cdrtools-3.02a06.tar.bz2 2117648 SHA256 ed79ab99414352ea9305163660b52b6a82394466bae03aebdbe2150997835eb1 SHA512 31a0743e39513841e77dcaaa52d746cafc0867ba01d46d43310f89e4ef2a0759fcac2e812aa323854daaa9a5ce8627c0612b8e461072a6066c20883ebe639c0c WHIRLPOOL 6358a39ee1fd51be417d3bb21ba7b43b8ee9b6dd71c925b7a1a8bc6f402380804f761749b3c912fc9f4a3e4d49bb4988441c3348ccfcc794847be8f0444628c9

@ -0,0 +1,136 @@
From acac103ba5772ae738ce5409d17feab80596cde6 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@g10code.com>
Date: Fri, 12 Feb 2016 22:12:21 +0100
Subject: [PATCH 1/1] common: Change simple_query to ignore status messages.
* common/simple-pwquery.c (simple_query): Ignore status messages.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
GnuPG-bug-id: 2229
---
common/simple-pwquery.c | 95 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 67 insertions(+), 28 deletions(-)
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index 90d04c0..b2d666c 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -618,6 +618,7 @@ simple_query (const char *query)
int fd = -1;
int nread;
char response[500];
+ int have = 0;
int rc;
rc = agent_open (&fd);
@@ -628,40 +629,78 @@ simple_query (const char *query)
if (rc)
goto leave;
- /* get response */
- nread = readline (fd, response, 499);
- if (nread < 0)
- {
- rc = -nread;
- goto leave;
- }
- if (nread < 3)
+ while (1)
{
- rc = SPWQ_PROTOCOL_ERROR;
- goto leave;
- }
+ if (! have || ! strchr (response, '\n'))
+ /* get response */
+ {
+ nread = readline (fd, &response[have],
+ sizeof (response) - 1 /* NUL */ - have);
+ if (nread < 0)
+ {
+ rc = -nread;
+ goto leave;
+ }
+ have += nread;
+ if (have < 3)
+ {
+ rc = SPWQ_PROTOCOL_ERROR;
+ goto leave;
+ }
+ response[have] = 0;
+ }
- if (response[0] == 'O' && response[1] == 'K')
- /* OK, do nothing. */;
- else if ((nread > 7 && !memcmp (response, "ERR 111", 7)
- && (response[7] == ' ' || response[7] == '\n') )
- || ((nread > 4 && !memcmp (response, "ERR ", 4)
- && (strtoul (response+4, NULL, 0) & 0xffff) == 99)) )
- {
- /* 111 is the old Assuan code for canceled which might still
- be in use by old installations. 99 is GPG_ERR_CANCELED as
- used by modern gpg-agents; 0xffff is used to mask out the
- error source. */
+ if (response[0] == 'O' && response[1] == 'K')
+ /* OK, do nothing. */;
+ else if ((nread > 7 && !memcmp (response, "ERR 111", 7)
+ && (response[7] == ' ' || response[7] == '\n') )
+ || ((nread > 4 && !memcmp (response, "ERR ", 4)
+ && (strtoul (response+4, NULL, 0) & 0xffff) == 99)) )
+ {
+ /* 111 is the old Assuan code for canceled which might still
+ be in use by old installations. 99 is GPG_ERR_CANCELED as
+ used by modern gpg-agents; 0xffff is used to mask out the
+ error source. */
#ifdef SPWQ_USE_LOGGING
- log_info (_("canceled by user\n") );
+ log_info (_("canceled by user\n") );
#endif
- }
- else
- {
+ }
+ else if (response[0] == 'S' && response[1] == ' ')
+ {
+ char *nextline;
+ int consumed;
+
+ nextline = strchr (response, '\n');
+ if (! nextline)
+ /* Point to the NUL. */
+ nextline = &response[have];
+ else
+ /* Move past the \n. */
+ nextline ++;
+
+ consumed = (size_t) nextline - (size_t) response;
+
+ /* Skip any additional newlines. */
+ while (consumed < have && response[consumed] == '\n')
+ consumed ++;
+
+ have -= consumed;
+
+ if (have)
+ memmove (response, &response[consumed], have + 1);
+
+ continue;
+ }
+ else
+ {
#ifdef SPWQ_USE_LOGGING
- log_error (_("problem with the agent\n"));
+ log_error (_("problem with the agent (unexpected response \"%s\"\n"),
+ response);
#endif
- rc = SPWQ_ERR_RESPONSE;
+ rc = SPWQ_ERR_RESPONSE;
+ }
+
+ break;
}
leave:
--
2.1.4

@ -0,0 +1,174 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="http://www.gnupg.org/"
MY_P="${P/_/-}"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tofu tools usb"
COMMON_DEPEND_LIBS="
dev-libs/npth
>=dev-libs/libassuan-2.4.1
>=dev-libs/libgcrypt-1.6.2[threads]
>=dev-libs/libgpg-error-1.21
>=dev-libs/libksba-1.2.0
>=net-misc/curl-7.10
gnutls? ( >=net-libs/gnutls-3.0 )
sys-libs/zlib
ldap? ( net-nds/openldap )
bzip2? ( app-arch/bzip2 )
readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:0 ) )
tofu? ( >=dev-db/sqlite-3.7 )
"
COMMON_DEPEND_BINS="app-crypt/pinentry
!app-crypt/dirmngr"
# Existence of executables is checked during configuration.
DEPEND="${COMMON_DEPEND_LIBS}
${COMMON_DEPEND_BINS}
static? (
>=dev-libs/libassuan-2[static-libs]
>=dev-libs/libgcrypt-1.6.2[static-libs]
>=dev-libs/libgpg-error-1.17[static-libs]
>=dev-libs/libksba-1.0.7[static-libs]
dev-libs/npth[static-libs]
>=net-misc/curl-7.10[static-libs]
sys-libs/zlib[static-libs]
bzip2? ( app-arch/bzip2[static-libs] )
)
nls? ( sys-devel/gettext )
doc? ( sys-apps/texinfo )"
RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
${COMMON_DEPEND_BINS}
selinux? ( sec-policy/selinux-gpg )
nls? ( virtual/libintl )"
REQUIRED_USE="smartcard? ( !static )"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${P}-tests.patch"
epatch_user
}
src_configure() {
local myconf=()
# 'USE=static' support was requested:
# gnupg1: bug #29299
# gnupg2: bug #159623
use static && append-ldflags -static
if use smartcard; then
myconf+=(
--enable-scdaemon
$(use_enable usb ccid-driver)
)
else
myconf+=( --disable-scdaemon )
fi
if use elibc_SunOS || use elibc_AIX; then
myconf+=( --disable-symcryptrun )
else
myconf+=( --enable-symcryptrun )
fi
# glib fails and picks up clang's internal stdint.h causing weird errors
[[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--enable-gpg \
--enable-gpgsm \
--enable-large-secmem \
--without-adns \
"${myconf[@]}" \
$(use_enable bzip2) \
$(use_enable gnutls) \
$(use_with ldap) \
$(use_enable nls) \
$(use_with readline) \
$(use_enable tofu) \
CC_FOR_BUILD="$(tc-getBUILD_CC)"
}
src_compile() {
default
if use doc; then
cd doc
emake html
fi
}
src_install() {
default
use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
# The help*txt files are read from the datadir by GnuPG directly.
# They do not work if compressed or moved!
#rm "${ED}"/usr/share/gnupg/help* || die
dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
dosym gpg2 /usr/bin/gpg
dosym gpgv2 /usr/bin/gpgv
echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
if use doc; then
dohtml doc/gnupg.html/* doc/*.png
fi
}
pkg_postinst() {
elog "If you wish to view images emerge:"
elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
elog "Remember to use photo-viewer option in configuration file to activate"
elog "the right viewer."
elog
if use smartcard; then
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
use usb && elog " - a CCID-compatible reader, used directly through libusb;"
elog " - sys-apps/pcsc-lite and a compatible reader device;"
elog " - dev-libs/openct and a compatible reader device;"
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
elog ""
elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
elog "app-crypt/ccid first."
fi
ewarn "Please remember to restart gpg-agent if a different version"
ewarn "of the agent is currently used. If you are unsure of the gpg"
ewarn "agent you are using please run 'killall gpg-agent',"
ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
if [[ -n ${REPLACING_VERSIONS} ]]; then
elog "If upgrading from a version prior than 2.1 you might have to re-import"
elog "secret keys after restarting the gpg-agent as the new version is using"
elog "a new storage mechanism."
elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
fi
}

@ -12,7 +12,7 @@ SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="

@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="FDL-1.3+"
SLOT="24"
KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
DEPEND="app-arch/xz-utils
sys-apps/texinfo"

@ -1,4 +1,2 @@
DIST pms-5-prebuilt.tar.xz 540244 SHA256 c93ce6902db323ab7ec613ad90a6dca2beda2dd2cebcc3e8ace83c1faeb6a1c7 SHA512 64baadd65f1751783032065832d2a18242967f1853d9b6ce0565a5477c021cfad3c06d9c3cfeb83ca9a64bbb052ec67c174bfd27036945ff762fe4bbf8c28451 WHIRLPOOL 9369c7604fdf0aadb7666f1fc08f041b064896d6359dd76779dc3af842fef14d81aed07301ec52eac11462664d16faed0e3fd50a0b96702822c59538917f5f78
DIST pms-5.tar.xz 50284 SHA256 a3b7702298adc4481584ed03f2d49e9fa7ea58638d8e8e9bf36fca832b2fbc87 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e WHIRLPOOL 373d333f1c060faacbfbd398ae3be3a0143c0ee618b093867313e4182bce7f15609445d2fc6b109f6f02fe597fe8f6cf687673029569e27fa7ed3411f4932013
DIST pms-6_p20151113-prebuilt.tar.xz 536876 SHA256 c9bd8e6cd5cc29031327202ebf645843a1055651b9719faab3e14ecb0c1dd246 SHA512 1ea7fe4ccd235921c75bfae267834005b50994cf76a43a0ae40e4d044179e375fd99fe4ddd7f03f9aeef3bb8cd7e3a02cf6f5cccb78a2daa3a3a02a428c60131 WHIRLPOOL 8297dbf280a66f1532ccd4632018efae5c7802f22c7024b4a0b7185641b4d97ac790303f86fd66fa91868c8f3071935d757568afd5e74cc36c80c22cf65f6fec
DIST pms-6_p20151113.tar.xz 53784 SHA256 2099b3c698acd38d2188afff8bb0c19817d5b9f5d98c6d1e3c746df12111a75f SHA512 92af8c06c9b278a468de74c2686285b9b9a5d0234537aa9371ac99875ec15238edf41f8d86ee058ed8c471ecffa9f033993eb07921fe1bd034d838717f70b7ef WHIRLPOOL 1276df9dd735d3558e4605ba7cc4ef7997f53b1d5cc73debd24cef9192f588039975e3cdae3d6877d7a882441f0a47c8797d85670794efcdfc1f2bdbd70d7e0b

@ -1,45 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
DESCRIPTION="Gentoo Package Manager Specification"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification"
SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}-prebuilt.tar.xz )"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="binary html"
DEPEND="!binary? (
dev-tex/leaflet
dev-texlive/texlive-bibtexextra
dev-texlive/texlive-latex
dev-texlive/texlive-latexextra
dev-texlive/texlive-latexrecommended
dev-texlive/texlive-science
html? (
app-text/recode
>=dev-tex/tex4ht-20090115_p0029
)
)"
RDEPEND=""
src_compile() {
if ! use binary; then
emake
use html && emake html
fi
}
src_install() {
dodoc pms.pdf eapi-cheatsheet.pdf
if use html; then
docinto html
dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
fi
}

@ -11,7 +11,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
LICENSE="CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="binary html"
DEPEND="!binary? (

@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
REQUIRED_USE="?? ( aqua X )"

@ -1,6 +1,3 @@
DIST nano-2.3.6.tar.gz 1816012 SHA256 a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534 SHA512 00d66dbbd1ee59b3d606af8688599ce627aa98cee494611e255293347b9aa4f3f583820ac28adae5f7209410a28669cdd5211258411d83364d3eb788d909bb73 WHIRLPOOL 6900e40e41f7bbd23a0dc76fe24bbf29c46b65bead328cb574008045f397e92643a7cee35605ef044e1921029dca54e49831548828490abbf24b2c63f0f9092b
DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd SHA512 7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d WHIRLPOOL 1e4aaaa67c44bf051210b9c65db80c30189606fc2ba0d3e1a6802a41e7244901e60858ad412a0c6ee6e0eaa90d65925d8c954b398387cc12109a626811d8ad07
DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a
DIST nano-2.4.2.tar.gz 1898633 SHA256 c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9 SHA512 487b03b33ac8fac4a774223e038b00463ca03e08093c506b10f4df56795039eff1c23518c1a4f32695cee1bb9bb5eb0a2dd3e1f8a9befcc573e7fca3d69fa9d3 WHIRLPOOL ac5942114a48d428e64db47afb919feef506e18da8b21627ea421e59bf3c235083b17ffaf7a6e510193b6617c0e2ad9d2460f64d5d8bbd6b828547bcd41b5c7c
DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607
DIST nano-2.5.0.tar.gz 1909625 SHA256 ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee SHA512 f05f1afa6a79ff6b87359c46fbdaf6161eacdc265ac6be155a0173e3ab5a17023e205d0b9667a942e754556182a9007fe4438f337a830d20b9546aad9d522ba6 WHIRLPOOL 29fbb67ce561da8255dca70d7554d604094a21e89e39ce94fadb67bc3236550ea1ee3f08838616deed8a4e37657df0ef6d320c701cc77a086d8d1ce2dae43d1d
DIST nano-2.5.2.tar.gz 1964016 SHA256 89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41 SHA512 ec4e35cfb23494dd09c23b195556dfb36b9329007d61bdfe6a25a43c9914e432160969c92ed991bb2221ea5facd5ae1c1e9aef0029dfa259d827b7ea4943a1d3 WHIRLPOOL 3963ed7fad9296ea0d85300dc7ad518a33e2b793d9b94e98056a4c82c9b7984ef187dfa10653f787b262755521321c1e2c37562c1f95cfd338927329c6d0aa97

@ -1,38 +0,0 @@
## Here is an example for awk.
##
syntax "awk" "\.awk$"
## records
icolor brightred "\$[0-9A-Z_!@#$*?-]+"
## awk-set variables
color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
## function declarations and special patterns
color brightgreen "\<(function|extension|BEGIN|END)\>"
## operators
color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
## flow control
color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
color brightyellow "\<(break|continue|return)\>"
## I/O statements
color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
color brightgreen "\<(system|fflush)\>"
## standard functions
color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
color magenta "\<(mktime|strftime|systime)\>"
color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
##
## String highlighting. You will in general want your comments and
## strings to come last, because syntax highlighting rules will be
## applied in the order they are read in.
color brightyellow "<[^= ]*>" ""(\\.|[^"])*""
## Comment highlighting
color brightblue "(^|[[:space:]])#.*$"
## Trailing whitespace
color ,green "[[:space:]]+$"

@ -1,9 +0,0 @@
## Here is an example for css files.
##
syntax "css" "\.css$"
color brightred "."
color brightyellow start="\{" end="\}"
color brightwhite start=":" end="[;^\{]"
color brightblue ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
color brightblue start="\/\*" end="\\*/"
color green ";|:|\{|\}"

@ -1,50 +0,0 @@
## Here is an example for ebuilds/eclasses
##
syntax "ebuild" "\.e(build|class)$"
## All the standard portage functions
color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
## Highlight bash related syntax
color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
color green "-(e|d|f|r|g|u|w|x|L)\>"
color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
## Highlight variables ... official portage ones in red, all others in bright red
color brightred "\$\{?[a-zA-Z_0-9]+\}?"
color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>"
color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
## Highlight portage commands
color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
color brightblue "\<do(header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>" "\<usex\>"
## Highlight common commands used in ebuilds
color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
## Highlight comments (doesnt work that well)
color yellow "#.*$"
## Highlight strings (doesnt work that well)
color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
## Trailing space is bad!
color ,green "[[:space:]]+$"
## Here is an example for Portage control files
##
syntax "/etc/portage" "\.(keywords|mask|unmask|use)$"
## Base text:
color green "^.+$"
## Use flags:
color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
## Likely version numbers:
color magenta "-[[:digit:]].*([[:space:]]|$)"
## Accepted arches:
color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
color white "[[:space:]][~-]?\*"
## Categories:
color cyan "^[[:space:]]*.*/"
## Masking regulators:
color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
## Comments:
color yellow "#.*$"

@ -1,88 +0,0 @@
https://bugs.gentoo.org/show_bug.cgi?id=544296
https://savannah.gnu.org/bugs/?44607
From 14a9c8aa0b124dc580c4805e848e6ff0880b43bd Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 27 Mar 2015 16:55:49 +0000
Subject: [PATCH] Treating the formatter like a speller, to fix compilation
with --disable-speller. This fixes Savannah bug #44607.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5168 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
src/global.c | 10 ++++++++--
src/text.c | 3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
ChangeLog
* src/global.c, src/text.c: Treat the formatter like a speller, to fix
compilation with --disable-speller. Fixes Savannah bug #44607.
diff --git a/src/global.c b/src/global.c
index 4643af2..27ff938 100644
--- a/src/global.c
+++ b/src/global.c
@@ -639,8 +639,10 @@ void shortcut_init(void)
const char *nano_lint_msg = N_("Invoke the linter, if available");
const char *nano_prevlint_msg = N_("Go to previous linter msg");
const char *nano_nextlint_msg = N_("Go to next linter msg");
+#ifndef DISABLE_SPELLER
const char *nano_formatter_msg = N_("Invoke formatter, if available");
#endif
+#endif
#endif /* !DISABLE_HELP */
#ifndef DISABLE_HELP
@@ -736,9 +738,11 @@ void shortcut_init(void)
#ifndef DISABLE_COLOR
add_to_funcs(do_linter, MMAIN,
N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW);
+#ifndef DISABLE_SPELLER
add_to_funcs(do_formatter, MMAIN,
N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW);
#endif
+#endif
#ifndef NANO_TINY
add_to_funcs(case_sens_void, MWHEREIS|MREPLACE,
@@ -1006,12 +1010,14 @@ void shortcut_init(void)
#ifndef DISABLE_SPELLER
add_to_sclist(MMAIN, "^T", do_spell, 0);
add_to_sclist(MMAIN, "F12", do_spell, 0);
+#ifndef DISABLE_COLOR
+ add_to_sclist(MMAIN, "^T", do_formatter, 0);
+ add_to_sclist(MMAIN, "F12", do_formatter, 0);
+#endif
#else
#ifndef DISABLE_COLOR
add_to_sclist(MMAIN, "^T", do_linter, 0);
add_to_sclist(MMAIN, "F12", do_linter, 0);
- add_to_sclist(MMAIN, "^T", do_formatter, 0);
- add_to_sclist(MMAIN, "F12", do_formatter, 0);
#endif
#endif
add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0);
diff --git a/src/text.c b/src/text.c
index 8814b49..98b2f80 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3223,6 +3223,7 @@ free_lints_and_return:
lint_cleanup();
}
+#ifndef DISABLE_SPELLER
/* Run a formatter for the given syntax.
* Expects the formatter to be non-interactive and
* operate on a file in-place, which we'll pass it
@@ -3370,7 +3371,7 @@ void do_formatter(void)
statusbar(finalstatus);
}
-
+#endif /* !DISABLE_SPELLER */
#endif /* !DISABLE_COLOR */
#ifndef NANO_TINY
--
2.3.3

@ -1,9 +0,0 @@
## Here is an example for xml files.
##
syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
color green start="<" end=">"
color cyan "<[^> ]+"
color cyan ">"
color yellow start="<!DOCTYPE" end="[/]?>"
color yellow start="<!--" end="-->"
color red "&[^;]*;"

@ -1,79 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit eutils
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
inherit subversion autotools
else
MY_P=${PN}-${PV/_}
SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
LICENSE="GPL-3"
SLOT="0"
IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
magic? ( sys-apps/file )
nls? ( virtual/libintl )
!ncurses? ( slang? ( sys-libs/slang ) )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
epatch_user
}
src_configure() {
eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
local myconf=()
case ${CHOST} in
*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
esac
econf \
--bindir="${EPREFIX}"/bin \
--htmldir=/trash \
$(use_enable !minimal color) \
$(use_enable !minimal multibuffer) \
$(use_enable !minimal nanorc) \
--disable-wrapping-as-root \
$(use_enable spell speller) \
$(use_enable justify) \
$(use_enable debug) \
$(use_enable nls) \
$(use_enable unicode utf8) \
$(use_enable minimal tiny) \
$(usex ncurses --without-slang $(use_with slang)) \
"${myconf[@]}"
}
src_install() {
default
rm -rf "${D}"/trash
dodoc doc/nanorc.sample
dohtml doc/faq.html
insinto /etc
newins doc/nanorc.sample nanorc
if ! use minimal ; then
# Enable colorization by default.
sed -i \
-e '/^# include /s:# *::' \
"${ED}"/etc/nanorc || die
fi
dodir /usr/bin
dosym /bin/nano /usr/bin/nano
}

@ -1,80 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit eutils
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
inherit subversion autotools
else
MY_P=${PN}-${PV/_}
SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
LICENSE="GPL-3"
SLOT="0"
IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
magic? ( sys-apps/file )
nls? ( virtual/libintl )
!ncurses? ( slang? ( sys-libs/slang ) )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
epatch "${FILESDIR}"/${P}-no-speller.patch #544296
epatch_user
}
src_configure() {
eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
local myconf=()
case ${CHOST} in
*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
esac
econf \
--bindir="${EPREFIX}"/bin \
--htmldir=/trash \
$(use_enable !minimal color) \
$(use_enable !minimal multibuffer) \
$(use_enable !minimal nanorc) \
--disable-wrapping-as-root \
$(use_enable spell speller) \
$(use_enable justify) \
$(use_enable debug) \
$(use_enable nls) \
$(use_enable unicode utf8) \
$(use_enable minimal tiny) \
$(usex ncurses --without-slang $(use_with slang)) \
"${myconf[@]}"
}
src_install() {
default
rm -rf "${D}"/trash
dodoc doc/nanorc.sample
dohtml doc/faq.html
insinto /etc
newins doc/nanorc.sample nanorc
if ! use minimal ; then
# Enable colorization by default.
sed -i \
-e '/^# include /s:# *::' \
"${ED}"/etc/nanorc || die
fi
dodir /usr/bin
dosym /bin/nano /usr/bin/nano
}

@ -1,79 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit eutils
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
inherit subversion autotools
else
MY_P=${PN}-${PV/_}
SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
LICENSE="GPL-3"
SLOT="0"
IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
magic? ( sys-apps/file )
nls? ( virtual/libintl )
!ncurses? ( slang? ( sys-libs/slang ) )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
epatch_user
}
src_configure() {
eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
local myconf=()
case ${CHOST} in
*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
esac
econf \
--bindir="${EPREFIX}"/bin \
--htmldir=/trash \
$(use_enable !minimal color) \
$(use_enable !minimal multibuffer) \
$(use_enable !minimal nanorc) \
--disable-wrapping-as-root \
$(use_enable spell speller) \
$(use_enable justify) \
$(use_enable debug) \
$(use_enable nls) \
$(use_enable unicode utf8) \
$(use_enable minimal tiny) \
$(usex ncurses --without-slang $(use_with slang)) \
"${myconf[@]}"
}
src_install() {
default
rm -rf "${D}"/trash
dodoc doc/nanorc.sample
dohtml doc/faq.html
insinto /etc
newins doc/nanorc.sample nanorc
if ! use minimal ; then
# Enable colorization by default.
sed -i \
-e '/^# include /s:# *::' \
"${ED}"/etc/nanorc || die
fi
dodir /usr/bin
dosym /bin/nano /usr/bin/nano
}

@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="LGPL-2.1+ GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
KEYWORDS="amd64 arm ~ppc x86"
IUSE="X png unicode xv"
RESTRICT="test"

@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DOCS="ChangeLog keyword-generation.sh"
ELISP_TEXINFO="${PN}.texi"

@ -1,2 +1 @@
DIST mmm-mode-0.5.1.tar.gz 247841 SHA256 d0b4bfc9b30bd089e58bd513664f604b0e2614b4056f2f44bd356868d53b10eb SHA512 83fad0abe26af7627fa7416fca5936bb8347a00c5428537b767c98201af137f2d62eceaca09cb9e7572edc9a93c5ea6ceca422e55984d4bcd5f69ec060c2ffee WHIRLPOOL 28a81aea21756fb3efc1cd4b591e109aaed69ddc86f42c5c5604150105c558810b12130c4acab523dae480622ee6e6ee5fd70812771213341d6b3286ca6eb3d1
DIST mmm-mode-0.5.4.tar.gz 174680 SHA256 db55529ba95f841826bee952e73e55b87d9c191004e7c985a9582eea2cd57c82 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e WHIRLPOOL ec46237a1537a334c017c56f52e0cb5b3e1890882cb07e6c88b5d5b76a8e03a9423270995bf4151946fbf0b6b00209f9e6e047f2225685f8ab703ec035425c33

@ -1,32 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit elisp
DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
HOMEPAGE="http://mmm-mode.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+ Texinfo-manual"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
SITEFILE="50${PN}-gentoo.el"
src_configure() {
econf --with-emacs
}
src_compile() {
emake -j1
}
src_install() {
elisp-install ${PN} *.el *.elc
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
doinfo *.info*
dodoc AUTHORS ChangeLog FAQ NEWS README README.Mason TODO
}

@ -12,7 +12,7 @@ SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ Texinfo-manual"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="mmm.texinfo"

@ -1 +1,2 @@
DIST afflib-3.7.4.tar.gz 569346 SHA256 74934ae60a76616442f1d593bdeb93dd6aa105b5dc8cee7e8e5d7529a77f46c0 SHA512 58791388a05d614dd5f219a74173de2ff0938a1f93b21e2dd0731aca52ea544ba60cc4325f0d284937467ce600a4302b7a2f724d84710ecc7f12db1a22a8e41c WHIRLPOOL db8d5f48aecc55bd4ee0e6f45552e37e6aa1621674d93a448ae5a5a6b3bba1ae9c40d8aac2211b6e27bf1ba72e1c998b9bb01e6c24298ef4287d7a117db9d820
DIST afflib-3.7.7.tar.gz 518933 SHA256 049acb8b430fc354de0ae8b8c2043c221a213bcb17259eb099e1d5523a9697bf SHA512 8698d66ab84601e5dcd64fcedf2087d5a8227895ed4009d314958eb223c56e0e59aa3e76d57f854a911f79194ae9c1ffc8af8e686310752744b43030c9e84e80 WHIRLPOOL bd3eb26aca379953b0b2d432cace22f84838a32e2f915a47e1a5d14e48ef133ab0aa40cf5de1c0656248181989bf2aa04ccb741a6e63bf7cdce34b101ef44641

@ -0,0 +1,66 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
inherit autotools-utils python-single-r1
MY_PN=AFFLIBv3
MY_P=${MY_PN}-${PV}
DESCRIPTION="Library that implements the AFF image standard"
HOMEPAGE="https://github.com/sshock/AFFLIBv3/"
SRC_URI="https://github.com/sshock/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos"
IUSE="fuse ncurses python qemu readline s3 static-libs threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="dev-libs/expat
dev-libs/openssl:0
sys-libs/zlib
fuse? ( sys-fs/fuse )
ncurses? ( sys-libs/ncurses )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0 )
s3? ( net-misc/curl )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-3.7.1-python-module.patch
"${FILESDIR}"/${PN}-3.6.12-pyaff-header.patch
)
S=${WORKDIR}/${MY_P}
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
sed -i '/FLAGS/s: -g::' configure.ac || die
sed -i '/-static/d' tools/Makefile.am || die
autotools-utils_src_prepare
}
src_configure() {
# Hacks for automagic dependencies
use ncurses || export ac_cv_lib_ncurses_initscr=no
use readline || export ac_cv_lib_readline_readline=no
local myeconfargs=(
$(use_enable fuse)
$(use_enable python)
$(use_enable qemu)
$(use_enable s3)
$(use_enable threads threading)
)
autotools-utils_src_configure
}

@ -57,7 +57,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" +cacert"

@ -1 +1,2 @@
DIST gcalcli-3.2.tar.gz 1672457 SHA256 9b3465be8e64c291ffe4582f8cb779a7025c700e6a83aae74722d87a3b88d55a SHA512 a2e0d9aea2f27eaee3796acfbfdc08b88a7792002b10f0e44b0db1187a7ecd50aa97f78df7236038c8c18bc1b6dacbfa4b26db6bfb5762c880415c10a5364d83 WHIRLPOOL 66b8e954c5d4527e2725d0f07786262f4365f356e3ef893aa8253d07c41523b5f9c71bffd03acc02b27c57001f0c1e7b3cd92fea7396974b8898b4940abff6fb
DIST gcalcli-3.3.2.tar.gz 1674569 SHA256 69c31b5bee1390b4187a48b85b57ba95e40db231489d3deec8c3d387305d2ff3 SHA512 725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0 WHIRLPOOL 86acaf08d36af331524e514c6bfc37e6591ec570dd5c25c0bca6b111aa901636082cc961b70fcadbc32616e72f6c09bbc8460aa97f15a146fa341850fa416d15

@ -0,0 +1,29 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
# google-api-python-client only supports these
PYTHON_COMPAT=( python2_7 pypy )
inherit python-r1
DESCRIPTION="Google Calendar Command Line Interface"
HOMEPAGE="https://github.com/insanum/gcalcli"
SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/google-api-python-client[${PYTHON_USEDEP}]
dev-python/gdata[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
src_install() {
dodoc -r ChangeLog README.md docs
python_foreach_impl python_doscript ${PN}
}

@ -1,2 +1 @@
DIST tmux-mem-cpu-load-2.1.0.tar.gz 2705 SHA256 846036b3d9b0f5e6b6e88988f483f0d82060ca2bbe9fbbd4f4d63ac287eccb7c SHA512 18db125eededc3b2d75f74563e2173daa9fd0a72a9e1eefa93010d3a338403a1393c1a49471e03703d0a72ce7a407070836e5f0486a19e83c02abe1bbec2d2b9 WHIRLPOOL fa64abb9f6e5f43311e13c7777dee835f0b75d9fef1c12c548d8705a86cc67cb18c1164d160d2ce216f8cea7d5b6ae9aae24f80fbac544bdcec20fa2011dbe94
DIST tmux-mem-cpu-load-2.2.1.tar.gz 9893 SHA256 fd90bd8d66f275f4cae36dc5bd05a2826ca3be63a86b916ef7a2b9d956817b9d SHA512 44d677bbe9eb457b8857c603f469c46767878b2b8af8f169f2b01393ce65fc8da3c33288bc0743b3c2846b77de798437130a7676ca95c5cab52cd4166d9ded73 WHIRLPOOL 4512f46972cd7f3eb6c4881ac735b71a4084b3e8a66906d85d9761343617647477f8b4559860a9104b3eaecf2486aea5a2c8a7c7f0011c878c2114259eba5823

@ -1,38 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="3"
inherit cmake-utils
IUSE=""
if [[ ${PV} == *9999* ]]; then
inherit git
EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
KEYWORDS=""
SRC_URI=""
else
KEYWORDS="amd64 x86"
SRC_URI="https://www.github.com/thewtex/${PN}/tarball/v${PV} -> ${P}.tar.gz"
fi
DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
LICENSE="Apache-2.0"
SLOT="0"
src_prepare() {
if [[ ${PV} == *9999* ]]; then
git_src_prepare
else
cd "${WORKDIR}"/thewtex-${PN}-*
S=$(pwd)
fi
}
src_install() {
cmake-utils_src_install
dodoc README.rst || die
}

@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
KEYWORDS=""
SRC_URI=""
else
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi

@ -1,26 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="3"
inherit cmake-utils
IUSE=""
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/thewtex/tmux-mem-cpu-load.git"}
KEYWORDS=""
SRC_URI=""
else
KEYWORDS="~amd64 ~x86"
SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
DESCRIPTION="CPU, RAM memory, and load monitor for use with tmux"
HOMEPAGE="https://github.com/thewtex/tmux-mem-cpu-load/"
LICENSE="Apache-2.0"
SLOT="0"
DOCS=( README.rst )

@ -1,2 +1 @@
DIST anyremote-6.4.tar.gz 2425993 SHA256 342eee7efdb88925d3729553db6d6314bdc6063b51d317931864f77a46254574 SHA512 7baf48e01356dd6f325ca62e005e04af22b4959f95bffb9144327c40ae6a9ebb295f3aab8b638fbf98439fdf748cd1bcb4fd8d3399f81827b657fe9a7311eae8 WHIRLPOOL b183e05e1826215ccdb15bedfc9faffca2be8cbce81fe355cdfe9479b8d267cd76e005909174cbeaddfd9b7992ee8f96cbd6a82271281f08738999a26680f3a3
DIST anyremote-6.5.tar.gz 2440051 SHA256 e94cd12bd6c1a04f1f0107266fcfa46d8d8e04d3872c22e76346bea192c31225 SHA512 e6190ec9ea4c66b7b85d77a9e056aeaf83d9730356780e9a54c0d27e31ce89399564b20e4bd62543aa72771049f34d359111d2c015e15fca5891d088391d2b73 WHIRLPOOL bbffc9d3dc662f086d4c4c6fa4a7edc2e86efc60e1c2588e46c3489ff5ecfd5ef93dd54f42c67a3d8f6e17f11565addef6cce75ab2154f229482403dd1aa0c62

@ -1,26 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
DESCRIPTION="Anyremote provides wireless bluetooth, infrared or cable remote control service"
HOMEPAGE="http://anyremote.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="bluetooth dbus"
RDEPEND="bluetooth? ( net-wireless/bluez )
dbus? ( sys-apps/dbus )
x11-libs/libXtst"
DEPEND="${RDEPEND}
virtual/pkgconfig"
DOCS=(AUTHORS ChangeLog NEWS README)
src_configure() {
econf --docdir="/usr/share/doc/${PF}/" $(use_enable bluetooth) $(use_enable dbus)
}

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="avahi bluetooth dbus"
RDEPEND="

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -126,7 +126,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.7.9:3[extensions(+)]

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -128,7 +128,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.7.9:3[extensions(+)]

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -117,7 +117,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.8.7:3[extensions(+)]

@ -117,7 +117,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.8.7:3[extensions(+)]

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -118,7 +118,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.8.7:3[extensions(+)]

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -118,7 +118,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.8.7:3[extensions(+)]

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -117,7 +117,7 @@ RDEPEND="
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
>=dev-db/sqlite-3.8.7:3[extensions(+)]

@ -1,2 +1 @@
DIST kraft-0.58.tar.xz 556404 SHA256 12c92dbdae05d01a491111ed42dfa6f487ec477f60e536e5a80efa6592997524 SHA512 450d68022f5ea1a19b6b9461f3db65233cdc6939cae5367a4c95d22eb6207881cbd798d723a87d43d3f20e84d8ffb2d601a3245324fa1c10078300c5b8e06845 WHIRLPOOL 60371a2db0bc6b39d3c6ce0f20922e8749df3ae74bcafb7a43c5861b9715dff7aef8407f2446702394bf697dca647e3d61989fa733e0b40514e493ecd25f93ca
DIST kraft-0.59.tar.xz 560116 SHA256 e05ff0b78a073bafffa5c0e41fe458461216b66fd57fc9432a1064a7be2b2034 SHA512 53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36 WHIRLPOOL d442c33ecbee4f0b3d8f33b358a5f7fab9f9c99d5e70019ca9d5910a3b717530008b6b09c3573132a27681f9e554f83f1798bc6b5a71d71fd10c81884692dd6e

@ -1,29 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
inherit kde4-base
DESCRIPTION="Software for operating a small business, helping create documents such as offers and invoices"
HOMEPAGE="http://www.volle-kraft-voraus.de/"
SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
dev-cpp/ctemplate
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsql:4[mysql,sqlite]
$(add_kdeapps_dep kdepimlibs)
"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -8,13 +8,13 @@ KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nd
nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
inherit kde4-base
DESCRIPTION="Software for operating a small business, helping create documents such as offers and invoices"
DESCRIPTION="Software for operating a small business, creating documents such as invoices"
HOMEPAGE="http://www.volle-kraft-voraus.de/"
SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="

@ -1,98 +0,0 @@
# ChangeLog for app-office/passepartout
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.25 2014/01/25 02:29:16 creffett Exp $
25 Jan 2014; Chris Reffett <creffett@gentoo.org> -passepartout-0.7.0.ebuild:
Remove old
24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> passepartout-0.7.0-r1.ebuild:
Stable for x86, wrt bug #491934
22 Dec 2013; Pacho Ramos <pacho@gentoo.org> passepartout-0.7.0-r1.ebuild:
amd64 stable, bug #491934
*passepartout-0.7.0-r1 (24 Jul 2013)
24 Jul 2013; Jeroen Roovers <jer@gentoo.org> +passepartout-0.7.0-r1.ebuild:
Fix docdir. Fix desktop file.
24 Jul 2013; Jeroen Roovers <jer@gentoo.org>
+files/passepartout-0.7.0-automake-1.13.patch, passepartout-0.7.0.ebuild:
Fix building with automake-1.13 by Ed Catmur (bug #467594).
21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers-
again-td259655.html
14 Jun 2012; Mike Gilbert <floppym@gentoo.org> -passepartout-0.6_p1.ebuild:
Remove broken version for bug 387789.
03 May 2012; Jeff Horelick <jdhore@gentoo.org> passepartout-0.6_p1.ebuild,
passepartout-0.7.0.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
05 Apr 2012; Jeff Horelick <jdhore@gentoo.org> passepartout-0.7.0.ebuild:
marked x86 per bug 410243
02 Apr 2012; Agostino Sarubbo <ago@gentoo.org> passepartout-0.7.0.ebuild:
Stable for amd64, wrt bug #410243
25 Mar 2012; Mike Gilbert <floppym@gentoo.org> passepartout-0.7.0.ebuild:
Build system calls AC_ARG_WITH incorrectly, causing --without-gnome to enable
gnome support. Bug 367867.
28 Mar 2011; Christoph Mende <angelos@gentoo.org> passepartout-0.6_p1.ebuild:
Fixed slot deps
15 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
passepartout-0.7.0.ebuild:
Use the new base eclass functions.
26 Dec 2009; Peter Volkov <pva@gentoo.org> passepartout-0.6_p1.ebuild,
passepartout-0.7.0.ebuild:
virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only
implementation left in the tree.
05 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
Retiring, bug 220219.
*passepartout-0.7.0 (20 Dec 2008)
20 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+files/passepartout-0.7.0-gcc42.patch,
+files/passepartout-0.7.0-gcc43.patch,
+files/passepartout-0.7.0-gcc44.patch,
+files/passepartout-0.7.0-include-flags.patch,
+files/passepartout-0.7.0-libtoolization.patch,
+files/passepartout-0.7.0-libxmlpp-2.6-depend.patch,
+files/passepartout-0.7.0-safer.patch, metadata.xml,
+passepartout-0.7.0.ebuild:
Be maintainer. Keyword ~amd64. Bump, fixing bug 206780. Also fixing: Bug
226441, maintainer-mode rebuild. Bug 226441, gcc-4.3 compilation. Bug
240389, new libsigc api failure.
*passepartout-0.6_p1 (22 Mar 2007)
22 Mar 2007; Leonardo Boshell <leonardop@gentoo.org>
+files/passepartout-0.6-extra_qual.patch, +passepartout-0.6_p1.ebuild:
New version including the latest patch released upstream for version 0.6.
Updated dependencies. Removed unnecessary or non-existant documents from
DOCS. Added extra patch to fix compilations with GCC 4.1.
12 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> metadata.xml:
Replacing text-markup herd with the new sgml herd.
05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
Regenerate digest in Manifest2 format.
*passepartout-0.6 (02 Apr 2005)
02 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +passepartout-0.6.ebuild:
Version bumped. This closes bug #77652.
*passepartout-0.5 (08 Nov 2004)
08 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
+passepartout-0.5.ebuild:
Initial import. Ebuild submitted by Patrik Kullman <patrik@yes.nu>;
bug #59352.

@ -1 +0,0 @@
DIST passepartout-0.7.0.tar.bz2 369232 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b SHA512 41b8ed3905ee5332a89bc8512a5481bc52bdf58871254137e48150ad0d00a561aa9483d2accd41672f34bc37bea645f2a5ad40435cfd45490c3ff5542032ab8f WHIRLPOOL 2da483041be06eb2d8f268bd291d8105a0840c4e73ee61abb36fd4394310657e673979092b155718a8dc48c74b645529774e27a265f683daa73a8fa7752693ec

@ -1,45 +0,0 @@
diff -NurdpB passepartout-0.6/src/pptout/document/group.h passepartout-0.6-patched/src/pptout/document/group.h
--- passepartout-0.6/src/pptout/document/group.h 2004-10-02 16:18:45.000000000 -0500
+++ passepartout-0.6-patched/src/pptout/document/group.h 2007-03-21 19:00:13.000000000 -0500
@@ -30,7 +30,7 @@ public:
void set_flow_around(bool);
bool get_flow_around() const;
Boundary get_obstacle_boundary() const;
- BoundaryVect Group::obstacle_list() const;
+ BoundaryVect obstacle_list() const;
void add(Pagent* obj);
Pagent* ungroup(Pagent* obj);
@@ -55,7 +55,7 @@ public:
/** Raised on direct changes to the group (i.e. new / ungrouped member) */
SigC::Signal1<void, Pagent*> group_changed_signal;
private:
- Boundary Group::get_untransformed_box() const;
+ Boundary get_untransformed_box() const;
ChildVec childs;
};
diff -NurdpB passepartout-0.6/src/pptout/propertiesdialog.h passepartout-0.6-patched/src/pptout/propertiesdialog.h
--- passepartout-0.6/src/pptout/propertiesdialog.h 2004-04-16 14:03:56.000000000 -0500
+++ passepartout-0.6-patched/src/pptout/propertiesdialog.h 2007-03-21 19:18:26.000000000 -0500
@@ -39,7 +39,7 @@ private:
// no destructor
~PropertiesDialog();
- void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index);
+ void show_page_contents(GtkNotebookPage*, guint index);
Gtk::Notebook book;
std::vector<PropBase*> pages;
diff -NurdpB passepartout-0.6/src/xml2ps/canvas.hh passepartout-0.6-patched/src/xml2ps/canvas.hh
--- passepartout-0.6/src/xml2ps/canvas.hh 2004-07-21 17:00:34.000000000 -0500
+++ passepartout-0.6-patched/src/xml2ps/canvas.hh 2007-03-21 18:47:12.000000000 -0500
@@ -52,7 +52,7 @@ namespace xml2ps {
HBox hbox(bool span, float margin_left, float margin_right,
float ascender, float descender);
- virtual void xml2ps::Canvas::addRelObstacle
+ virtual void addRelObstacle
(const float left, const float bottom, const float right, const float top);
// Check where the current column starts.

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index e59f631..ca329c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
# For automake < 1.6 you need to use this line instead:
#AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE)
-AM_CONFIG_HEADER(src/defines.h)
+AC_CONFIG_HEADERS([src/defines.h])
# AC_CONFIG_HEADER(src/defines.h)
# We're just a few binaries...not worth doing shared by default?

@ -1,14 +0,0 @@
diff -urNad passepartout-0.7.0~/src/ps/misc.cc passepartout-0.7.0/src/ps/misc.cc
--- passepartout-0.7.0~/src/ps/misc.cc 2007-06-13 13:05:07.000000000 +0200
+++ passepartout-0.7.0/src/ps/misc.cc 2007-09-14 17:49:49.000000000 +0200
@@ -3,6 +3,8 @@
///
#include "misc.h"
-std::ostream& PS::operator << (std::ostream& out, const PS::Concat& c) {
- return out << '[' << c.matrix << "] concat\n";
+namespace PS {
+ std::ostream& operator << (std::ostream& out, const Concat& c) {
+ return out << '[' << c.matrix << "] concat\n";
+ }
}

@ -1,97 +0,0 @@
--- a/src/fonts/afm.cc
+++ b/src/fonts/afm.cc
@@ -10,6 +10,8 @@
#include "util/warning.h"
#include "util/stringutil.h"
+#include <limits>
+
using std::string;
class font::AFMetrics::GlyphData {
--- a/src/fonts/fontmanager.cc
+++ b/src/fonts/fontmanager.cc
@@ -14,6 +14,8 @@
#include "util/filesys.h"
#include "util/warning.h"
+#include <memory>
+
font::FontManager* font::FontManager::_instance = 0;
// StaticMutex can, unlike regular Mutex, be created before the call
// to thread_init
--- a/src/pptout/document/rasterframe.cc
+++ b/src/pptout/document/rasterframe.cc
@@ -12,6 +12,8 @@
#include "ps/misc.h"
#include "pptout/config.h" // Todo
+#include <ctime>
+
RasterFrame::RasterFrame(const ElementWrap& xml, Group *parent)
: BasicFrame(xml, parent),
association(xml.get_filename("file")),
--- a/src/ps/encode.h
+++ b/src/ps/encode.h
@@ -8,6 +8,7 @@
#include <iostream>
#include <string>
#include <vector>
+#include <cstring>
// Standard PostScript encoding filters
--- a/src/ps/examinepdf.cc
+++ b/src/ps/examinepdf.cc
@@ -5,6 +5,7 @@
#include <fstream>
#include <cassert> // Todo: other assert!
#include <iostream>
+#include <cstdlib>
void usage() {}
--- a/src/ps/pdf.cc
+++ b/src/ps/pdf.cc
@@ -15,6 +15,7 @@
#include <stdexcept>
#include <glibmm/convert.h>
#include <fstream>
+#include <typeinfo>
namespace {
--- a/src/util/filesys.cc
+++ b/src/util/filesys.cc
@@ -14,6 +14,9 @@
#include <sys/types.h>
#endif
+#include <cstring>
+#include <stdlib.h>
+
using std::string;
ClibException::ClibException(const string& msg)
--- a/src/util/vector.h
+++ b/src/util/vector.h
@@ -5,6 +5,7 @@
///
#include <algorithm> // max
#include <cmath> // sqrt
+#include <ostream>
template<class C> C sqr(const C& c) { return c*c; }
template <class C>
--- a/src/util/tempfile.cc
+++ b/src/util/tempfile.cc
@@ -8,6 +8,9 @@
#include <stdexcept>
#include <unistd.h>
+#include <cstring>
+#include <stdlib.h>
+
namespace {
std::string get_tmplate(std::string base) {
base += "XXXXXX";

@ -1,109 +0,0 @@
From tbm@cyrius.com Sat Nov 08 17:07:16 2008
Received: (at submit) by bugs.debian.org; 8 Nov 2008 17:07:16 +0000
X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
(2007-08-08) on rietz.debian.org
X-Spam-Level:
X-Spam-Bayes: score:0.0000 Tokens: new, 59; hammy, 151; neutral, 105; spammy,
0. spammytokens: hammytokens:0.000-+--libxml2, 0.000-+--amd64,
0.000-+--sk:libgnom, 0.000-+--Usertags, 0.000-+--H*r:1000
X-Spam-Status: No, scoreø.8 required0 testsL,BAYES_00,HAS_PACKAGE,
MURPHY_DRUGS_REL8,WEIRD_PORT autolearnúm
version2.3-bugs.debian.org_2005_01_02
Return-path: <tbm@cyrius.com>
Received: from sorrow.cyrius.com ([65.19.161.204])
by rietz.debian.org with esmtp (Exim 4.63)
(envelope-from <tbm@cyrius.com>)
id 1KyrHH-0002u6-Vy
for submit@bugs.debian.org; Sat, 08 Nov 2008 17:07:16 +0000
Received: by sorrow.cyrius.com (Postfix, from userid 10)
id 564C8D857; Sat, 8 Nov 2008 17:07:15 +0000 (UTC)
Received: by deprecation.cyrius.com (Postfix, from userid 1000)
id 0F2C1150B58; Sat, 8 Nov 2008 18:06:54 +0100 (CET)
Date: Sat, 8 Nov 2008 18:06:53 +0100
From: Martin Michlmayr <tbm@cyrius.com>
To: submit@bugs.debian.org
Subject: FTBFS with GCC 4.4: missing #include
Message-ID: <20081108170653.GD27323@deprecation.cyrius.com>
References: <20081108132249.5332A460DB@em64t.snowman.net>
MIME-Version: 1.0
Content-Type: text/plain; charset-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20081108132249.5332A460DB@em64t.snowman.net>
User-Agent: Mutt/1.5.18 (2008-05-17)
Delivered-To: submit@bugs.debian.org
Package: passepartout
Version: 0.7.0-1.1
User: debian-gcc@lists.debian.org
Usertags: ftbfs-gcc-4.4
Tags: patch
Your package fails to build with the upcoming GCC 4.4. Version 4.4
has not been released yet but I'm building with a snapshot in order
to find errors and give people an advance warning.
GCC 4.4 cleaned up some more C++ headers. You always have to #include
headers directly and cannot rely for things to be included indirectly.
You can reproduce this problem with gcc-snapshot from unstable.
> Automatic build of passepartout_0.7.0-1.1 on em64t by sbuild/amd64 0.53
...
> if x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../src -I/usr/include/libxml++-1.0 -I/usr/lib/libxml++-1.0/include -I/usr/include/libxml2 -D_REENTRANT -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -D_REENTRANT -I/usr/include/libgnomecanvasmm-2.6 -I/usr/lib/libgnomecanvasmm-2.6/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/libgnomecanvas-2.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -MT stringutil.o -MD -MP -MF ".deps/stringutil.Tpo" -c -o stringutil.o stringutil.cc; \
> then mv -f ".deps/stringutil.Tpo" ".deps/stringutil.Po"; else rm -f ".deps/stringutil.Tpo"; exit 1; fi
> In file included from stringutil.cc:4:
> stringutil.h: In function 'C to(const std::string&)':
> stringutil.h:25: error: 'EOF' was not declared in this scope
> stringutil.cc: In function 'std::string to_roman(int)':
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
> make[4]: *** [stringutil.o] Error 1
> make[4]: Leaving directory `/build/tbm/passepartout-0.7.0/src/util'
--- src/util/stringutil.h~ 2008-11-08 16:48:10.000000000 +0000
+++ src/util/stringutil.h 2008-11-08 16:48:25.000000000 +0000
@@ -4,6 +4,7 @@
// Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
///
#include "typeinfo.h"
+#include <cstdio>
#include <string>
#include <sstream>
#include <stdexcept>
--- src/util/warning.cc~ 2008-11-08 16:48:33.000000000 +0000
+++ src/util/warning.cc 2008-11-08 16:48:43.000000000 +0000
@@ -2,6 +2,7 @@
// Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
///
#include "warning.h"
+#include <cstdio>
class NullFdBuf : public std::streambuf {
public:
--- src/util/filedescriptors.cc~ 2008-11-08 16:49:15.000000000 +0000
+++ src/util/filedescriptors.cc 2008-11-08 16:49:23.000000000 +0000
@@ -5,6 +5,7 @@
#include "filesys.h"
#include <fcntl.h>
#include <unistd.h>
+#include <cstdio>
int
filedesc::move(int to, int from) {
--
Martin Michlmayr
http://www.cyrius.com/

@ -1,140 +0,0 @@
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/fonts/Makefile.am passepartout-0.7.0/src/fonts/Makefile.am
--- passepartout-0.7.0.orig/src/fonts/Makefile.am 2007-06-13 07:05:06.000000000 -0400
+++ passepartout-0.7.0/src/fonts/Makefile.am 2007-08-07 19:11:04.000000000 -0400
@@ -5,9 +5,9 @@
libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
-libfonts_a_CXXFLAGS = -I$(top_srcdir)/src
+libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
# for Glib::ustring
-libfonts_a_CXXFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
#libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
\ No newline at end of file
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/Makefile.am passepartout-0.7.0/src/pptout/Makefile.am
--- passepartout-0.7.0.orig/src/pptout/Makefile.am 2007-07-26 07:31:05.000000000 -0400
+++ passepartout-0.7.0/src/pptout/Makefile.am 2007-08-07 19:14:51.000000000 -0400
@@ -32,10 +32,10 @@
$(BUILT_SOURCES) \
$(NULL)
-passepartout_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
- $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
+passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
-passepartout_CXXFLAGS += -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
+passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
+ $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/document/Makefile.am passepartout-0.7.0/src/pptout/document/Makefile.am
--- passepartout-0.7.0.orig/src/pptout/document/Makefile.am 2007-06-13 07:05:06.000000000 -0400
+++ passepartout-0.7.0/src/pptout/document/Makefile.am 2007-08-07 19:15:12.000000000 -0400
@@ -10,6 +10,6 @@
textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc \
loader.cc typesetterthread.cc
-libdocument_a_CXXFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
+libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
-libdocument_a_CXXFLAGS += -I$(top_srcdir)/src
+libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/widget/Makefile.am passepartout-0.7.0/src/pptout/widget/Makefile.am
--- passepartout-0.7.0.orig/src/pptout/widget/Makefile.am 2007-06-14 06:17:20.000000000 -0400
+++ passepartout-0.7.0/src/pptout/widget/Makefile.am 2007-08-07 19:29:32.000000000 -0400
@@ -8,6 +8,6 @@
dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc \
usererror.cc programs.cc zoomer.cc
-libwidget_a_CXXFLAGS = $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
+libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
-libwidget_a_CXXFLAGS += -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
+libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/ps/Makefile.am passepartout-0.7.0/src/ps/Makefile.am
--- passepartout-0.7.0.orig/src/ps/Makefile.am 2007-06-13 07:48:09.000000000 -0400
+++ passepartout-0.7.0/src/ps/Makefile.am 2007-08-07 19:26:30.000000000 -0400
@@ -9,12 +9,12 @@
examinepdf_SOURCES = examinepdf.cc
-# for Glib::ustring
-libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+libps_a_CPPFLAGS = -I$(top_srcdir)/src
-libps_a_CXXFLAGS += -I$(top_srcdir)/src
+# for Glib::ustring
+libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-examinepdf_CXXFLAGS = $(libps_a_CXXFLAGS)
+examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
examinepdf_LDADD = $(GTKMM_LIBS) \
-L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
examinepdf_DEPENDENCIES = libps.a
@@ -24,8 +24,8 @@
TESTS = runtest
check_PROGRAMS = runtest
runtest_SOURCES = test_glyphlist.cc
-runtest_CXXFLAGS = -I$(top_srcdir)/src
-runtest_CXXFLAGS += $(GTKMM_CFLAGS)
+runtest_CPPFLAGS = -I$(top_srcdir)/src
+runtest_CPPFLAGS += $(GTKMM_CFLAGS)
runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
$(GTKMM_LIBS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/testbed/Makefile.am passepartout-0.7.0/src/testbed/Makefile.am
--- passepartout-0.7.0.orig/src/testbed/Makefile.am 2007-06-13 07:05:07.000000000 -0400
+++ passepartout-0.7.0/src/testbed/Makefile.am 2007-08-07 19:17:57.000000000 -0400
@@ -4,8 +4,8 @@
libppttest_a_SOURCES = testbed.cc
-libppttest_a_CXXFLAGS = -I$(top_srcdir)/src
+libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
# Just because Glib::Exception is stupid and doesn't inherit the standard
# exception the testbed has to know about glib!
-libppttest_a_CXXFLAGS += $(GTKMM_CFLAGS)
+libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/util/Makefile.am passepartout-0.7.0/src/util/Makefile.am
--- passepartout-0.7.0.orig/src/util/Makefile.am 2007-06-14 06:12:42.000000000 -0400
+++ passepartout-0.7.0/src/util/Makefile.am 2007-08-07 19:18:50.000000000 -0400
@@ -12,12 +12,12 @@
cmdline.cc xmlwrap.cc
# gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
-CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
+AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
TESTS = runtest
check_PROGRAMS = runtest
runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
test_boundary.cc test_procio.cc test_cmdline.cc
-runtest_CXXFLAGS = -I$(top_srcdir)/src
+runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
runtest_DEPENDENCIES = $(noinst_LIBRARIES)
runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
diff -Nurd -x'*~' passepartout-0.7.0.orig/src/xml2ps/Makefile.am passepartout-0.7.0/src/xml2ps/Makefile.am
--- passepartout-0.7.0.orig/src/xml2ps/Makefile.am 2007-06-22 12:07:26.000000000 -0400
+++ passepartout-0.7.0/src/xml2ps/Makefile.am 2007-08-07 19:36:26.000000000 -0400
@@ -13,12 +13,12 @@
xml2ps_SOURCES = main.cc
-libxml2ps_a_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
- $(GNOMECANVAS_CFLAGS)
+libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
-libxml2ps_a_CXXFLAGS += -I$(top_srcdir)/src
+libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
+ $(GNOMECANVAS_CFLAGS)
-xml2ps_CXXFLAGS = $(libxml2ps_a_CXXFLAGS)
+xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a

@ -1,293 +0,0 @@
Index: trunk/src/ps/Makefile.am
===================================================================
--- trunk/src/ps/Makefile.am (revision 1530)
+++ trunk/src/ps/Makefile.am (working copy)
@@ -1,31 +1,26 @@
bin_PROGRAMS = examinepdf
-noinst_LIBRARIES = libps.a
+noinst_LTLIBRARIES = libps.la
dist_noinst_HEADERS = encode.h pdf.h unicode.h pfb2pfa.h misc.h wineps.h \
pdfparser.h type42.h
-libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
+libps_la_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
wineps.cc pdfparser.cc type42.cc
examinepdf_SOURCES = examinepdf.cc
-libps_a_CPPFLAGS = -I$(top_srcdir)/src
+libps_la_LIBADD = ../fonts/libfonts.la
# for Glib::ustring
-libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+libps_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
+libps_la_LIBADD += $(GTKMM_LIBS)
-examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
-examinepdf_LDADD = $(GTKMM_LIBS) \
- -L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
-examinepdf_DEPENDENCIES = libps.a
+examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS)
+examinepdf_LDADD = libps.la
-#libps_a_LIBADD = $(GTKMM_LIBS)
-
TESTS = runtest
check_PROGRAMS = runtest
runtest_SOURCES = test_glyphlist.cc
-runtest_CPPFLAGS = -I$(top_srcdir)/src
-runtest_CPPFLAGS += $(GTKMM_CFLAGS)
-runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
-runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
+runtest_CPPFLAGS = $(GTKMM_CFLAGS)
+runtest_LDADD = ../testbed/libppttest.la libps.la ../util/libpptutil.la \
$(GTKMM_LIBS)
Index: trunk/src/xml2ps/Makefile.am
===================================================================
--- trunk/src/xml2ps/Makefile.am (revision 1530)
+++ trunk/src/xml2ps/Makefile.am (working copy)
@@ -1,28 +1,29 @@
bin_PROGRAMS = xml2ps
-noinst_LIBRARIES = libxml2ps.a
+noinst_LTLIBRARIES = libxml2ps.la
dist_noinst_HEADERS = blockcontainer.hh boundaries.hh canvas.hh \
line.hh paragraph.hh typesetter.hh pagedstream.hh \
pdfcanvas.hh pscanvas.hh psstream.hh xly.hh xcanvas.hh
-libxml2ps_a_SOURCES = paragraph.cc xly.cc typesetter.cc \
+libxml2ps_la_SOURCES = paragraph.cc xly.cc typesetter.cc \
blockcontainer.cc psstream.cc line.cc canvas.cc \
pagedstream.cc pscanvas.cc boundaries.cc pdfcanvas.cc \
xcanvas.cc
xml2ps_SOURCES = main.cc
-libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
-
-libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
+libxml2ps_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
$(GNOMECANVAS_CFLAGS)
-xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
+libxml2ps_la_LIBADD =../util/libpptutil.la ../fonts/libfonts.la ../ps/libps.la \
+ $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
- libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a
+xml2ps_CPPFLAGS = $(libxml2ps_la_CPPFLAGS)
+xml2ps_LDADD = libxml2ps.la \
+ $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
+
#install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)
dist_xml_DATA = xml2ps.dtd xhtml.xslt docbook.xslt
Index: trunk/src/fonts/Makefile.am
===================================================================
--- trunk/src/fonts/Makefile.am (revision 1530)
+++ trunk/src/fonts/Makefile.am (working copy)
@@ -1,13 +1,15 @@
-noinst_LIBRARIES = libfonts.a
+noinst_LTLIBRARIES = libfonts.la
dist_noinst_HEADERS = fontinfo.hh fontmanager.hh fontmetrics.hh afm.hh \
freetype.hh
-libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
+libfonts_la_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
-libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
-
# for Glib::ustring
-libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+libfonts_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
-#libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
\ No newline at end of file
+libfonts_la_LIBADD = ../util/libpptutil.la $(FREETYPE_LIBS) $(GTKMM_LIBS)
+
+# can't have explicit circular dependency, so rely on consumers
+# to link against them and us
+#libfonts_la_LIBADD += ../ps/libps.la
Index: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am (revision 1530)
+++ trunk/src/Makefile.am (working copy)
@@ -1 +1 @@
-SUBDIRS = testbed util fonts ps xml2ps pptout
+SUBDIRS = util testbed fonts ps xml2ps pptout
Index: trunk/src/testbed/Makefile.am
===================================================================
--- trunk/src/testbed/Makefile.am (revision 1530)
+++ trunk/src/testbed/Makefile.am (working copy)
@@ -1,11 +1,18 @@
-noinst_LIBRARIES = libppttest.a
+noinst_LTLIBRARIES = libppttest.la
dist_noinst_HEADERS = testbed.hh
-libppttest_a_SOURCES = testbed.cc
+libppttest_la_SOURCES = testbed.cc
-libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
-
# Just because Glib::Exception is stupid and doesn't inherit the standard
# exception the testbed has to know about glib!
-libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
+libppttest_la_CPPFLAGS = $(GTKMM_CFLAGS)
+
+libppttest_la_LIBADD = ../util/libpptutil.la $(GTKMM_LIBS)
+
+TESTS = runtest
+check_PROGRAMS = runtest
+runtest_SOURCES = ../util/test_stringutil.cc ../util/test_valuunit.cc ../util/test_matrix.cc \
+ ../util/test_boundary.cc ../util/test_procio.cc ../util/test_cmdline.cc
+runtest_CPPFLAGS = $(GTKMM_CFLAGS)
+runtest_LDADD = libppttest.la ../util/libpptutil.la $(GTKMM_LIBS)
Index: trunk/src/pptout/widget/Makefile.am
===================================================================
--- trunk/src/pptout/widget/Makefile.am (revision 1530)
+++ trunk/src/pptout/widget/Makefile.am (working copy)
@@ -1,13 +1,13 @@
-noinst_LIBRARIES = libwidget.a
+noinst_LTLIBRARIES = libwidget.la
dist_noinst_HEADERS = spinner.h filesel.h imagefilesel.h dialogwrap.h \
subpanel.h wmisc.h errordialog.h usererror.h programs.h \
zoomer.h
-libwidget_a_SOURCES = spinner.cc filesel.cc imagefilesel.cc \
+libwidget_la_SOURCES = spinner.cc filesel.cc imagefilesel.cc \
dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc \
usererror.cc programs.cc zoomer.cc
-libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
-
-libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
+libwidget_la_CPPFLAGS = -DDOCDIR=\"$(docdir)\"
+libwidget_la_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
+libwidget_la_LIBADD = ../../util/libpptutil.la $(GTKMM_LDFLAGS) $(GNOMEVFS_LDFLAGS) $(GNOME_LDFLAGS)
Index: trunk/src/pptout/document/Makefile.am
===================================================================
--- trunk/src/pptout/document/Makefile.am (revision 1530)
+++ trunk/src/pptout/document/Makefile.am (working copy)
@@ -1,15 +1,18 @@
-noinst_LIBRARIES = libdocument.a
+noinst_LTLIBRARIES = libdocument.la
dist_noinst_HEADERS = basicframe.h cachedframe.h document.h group.h \
imageframe.h page.h pagent.h rasterframe.h textframe.h \
textstream.h fileerrors.h paper_sizes.h getxsltparams.h \
loader.h filecontext.h typesetterthread.h
-libdocument_a_SOURCES = basicframe.cc cachedframe.cc document.cc \
+libdocument_la_SOURCES = basicframe.cc cachedframe.cc document.cc \
group.cc imageframe.cc page.cc pagent.cc rasterframe.cc \
textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc \
loader.cc typesetterthread.cc
-libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
+libdocument_la_CPPFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
+# can't get complete symbol resolution here...rasterframe.cc uses
+# config() from ../passepartout-config.o but subdirs build before
+# parent so cannot easily get it
+libdocument_la_LIBADD = ../../util/libpptutil.la ../../ps/libps.la ../../xml2ps/libxml2ps.la ../widget/libwidget.la $(GTKMM_LIBS) $(XMLPP_LIBS)
Index: trunk/src/pptout/Makefile.am
===================================================================
--- trunk/src/pptout/Makefile.am (revision 1530)
+++ trunk/src/pptout/Makefile.am (working copy)
@@ -1,4 +1,4 @@
-SUBDIRS = document widget icons
+SUBDIRS = widget document icons
EXTRA_DIST = NOTES
@@ -32,19 +32,19 @@
$(BUILT_SOURCES) \
$(NULL)
-passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
+passepartout_CPPFLAGS = -DXMLPATH=\"$(xmldir)\"
passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
-passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
- $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
+pptpartlibs= document/libdocument.la ../xml2ps/libxml2ps.la \
+ ../fonts/libfonts.la ../ps/libps.la \
+ ../util/libpptutil.la widget/libwidget.la
-pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a \
- ../fonts/libfonts.a ../ps/libps.a \
- ../util/libpptutil.a widget/libwidget.a
+passepartout_LDADD = $(pptpartlibs)
-passepartout_LDADD += $(pptpartlibs)
+passepartout_LDADD += $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
+ $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
# Extra dependencies for builddate, so it is rebuilt every time anything else
# is rebuilt
Index: trunk/src/util/Makefile.am
===================================================================
--- trunk/src/util/Makefile.am (revision 1530)
+++ trunk/src/util/Makefile.am (working copy)
@@ -1,23 +1,17 @@
-noinst_LIBRARIES = libpptutil.a
+noinst_LTLIBRARIES = libpptutil.la
dist_noinst_HEADERS = stringutil.h filesys.h warning.h os.h configfile.h \
valueunit.h units.h refcount.h matrix.h boundary.h \
rectboundary.h typeinfo.h barrier.h processman.h tempfile.h \
filewatcher.h vector.h filedescriptors.h cmdline.h xmlwrap.h
-libpptutil_a_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
+libpptutil_la_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
configfile.cc \
matrix.cc boundary.cc rectboundary.cc typeinfo.cc barrier.cc \
processman.cc tempfile.cc filewatcher.cc filedescriptors.cc \
cmdline.cc xmlwrap.cc
# gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
-AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
+libpptutil_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-TESTS = runtest
-check_PROGRAMS = runtest
-runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
- test_boundary.cc test_procio.cc test_cmdline.cc
-runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
-runtest_DEPENDENCIES = $(noinst_LIBRARIES)
-runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
+libpptutil_la_LIBADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac (revision 1530)
+++ trunk/configure.ac (working copy)
@@ -9,14 +9,16 @@
AM_CONFIG_HEADER(src/defines.h)
# AC_CONFIG_HEADER(src/defines.h)
-# Define global compiler flags:
-MY_CXXFLAGS="-Wall"
-CXXFLAGS="$CXXFLAGS $MY_CXXFLAGS"
+# We're just a few binaries...not worth doing shared by default?
+AC_DISABLE_SHARED
# Checks for programs.
AC_PROG_CXX
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
+# Define global compiler flags:
+CXXFLAGS="$CXXFLAGS -Wall"
+
# AC_APPLY_RPATH(LIBS)
# --------------------
# Add an -rpath linker option for each -L path in LIBS

@ -1,11 +0,0 @@
--- trunk/configure.ac 2007/08/08 17:47:27 1527
+++ trunk/configure.ac 2007/08/09 14:55:36 1529
@@ -30,7 +30,7 @@
# check for libxml++
AC_SUBST([XMLPP_LIBS])
AC_SUBST([XMLPP_CFLAGS])
-PKG_CHECK_MODULES([XMLPP], libxml++-1.0 >= 1.0)
+PKG_CHECK_MODULES([XMLPP], libxml++-2.6 >= 1.0)
AC_APPLY_RPATH([XMLPP_LIBS])
AC_SUBST([GTKMM_LIBS])

@ -1,13 +0,0 @@
Index: src/pptout/postscriptviewent.cc
===================================================================
--- src/pptout/postscriptviewent.cc (revision 1517)
+++ src/pptout/postscriptviewent.cc (arbetskopia)
@@ -143,7 +143,7 @@
std::ostringstream tmp;
tmp << psinterpreter //assuming it is ghostscript
- << " -q -dSAFER -dNOPAUSE -dBATCH"
+ << " -q -dSAFE -dNOPAUSE -dBATCH"
<< " -sDEVICE=" << preferredDeviceName();
// gs doesn't use fontconfig, so give font paths as parameters

@ -1,92 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit autotools base eutils gnome2 libtool
DESCRIPTION="A DTP application for the X Window System"
HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
SRC_URI="mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2"
IUSE="gnome"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
COMMON_DEPS="dev-cpp/libxmlpp:2.6
>=dev-libs/libxml2-2
dev-cpp/gtkmm:2.4
dev-cpp/libgnomecanvasmm:2.6
dev-libs/glib:2
dev-libs/libsigc++:2
media-libs/freetype:2
virtual/fam
gnome? (
gnome-base/libgnome
gnome-base/gnome-vfs
)
"
RDEPEND="${COMMON_DEPS}
dev-libs/libxslt
app-text/ghostscript-gpl"
DEPEND="${COMMON_DEPS}
virtual/pkgconfig"
DOCS="AUTHORS BUGS NEWS README"
# GCC-4.2 patch:
# https://bugzilla.gnome.org/477017
# GCC-4.3 patch:
# Snatched from Debian
# https://bugzilla.gnome.org/565131
# include-flags:
# https://bugzilla.gnome.org/464517
# libtoolization:
# https://bugzilla.gnome.org/464567
# libxml-2.6:
# https://bugzilla.gnome.org/449596
# The include and libtoolization patches are needed for
# forced as-needed to work.
PATCHES=(
"${FILESDIR}/${P}-gcc42.patch"
"${FILESDIR}/${P}-gcc43.patch"
"${FILESDIR}/${P}-gcc44.patch"
"${FILESDIR}/${P}-include-flags.patch"
"${FILESDIR}/${P}-libtoolization.patch"
"${FILESDIR}/${P}-safer.patch"
"${FILESDIR}/${P}-libxmlpp-2.6-depend.patch"
"${FILESDIR}/${P}-automake-1.13.patch"
)
src_unpack() {
base_src_unpack
}
src_prepare() {
gnome2_omf_fix
base_src_prepare
eautoreconf
elibtoolize
}
src_configure() {
# Bug 367867: Broken AC_ARG_WITH
use gnome && G2CONF="--with-gnome"
gnome2_src_configure
}
src_compile() {
base_src_compile
}
src_install() {
gnome2_src_install
mv "${D}"/usr/share/doc/${PN}/* "${D}/usr/share/doc/${PF}" || die
rmdir "${D}"/usr/share/doc/${PN}/ || die
make_desktop_entry "/usr/bin/passepartout" "Passepartout DTP" "" "GNOME;Graphics"
}

@ -1,4 +1,3 @@
DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca

@ -1,150 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
inherit cmake-utils fdo-mime python-single-r1
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/"
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
IUSE+=" ${IUSE_LINGUAS// / linguas_}"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
tk? ( scripts )"
COMMON_DEPEND="
${PYTHON_DEPS}
dev-libs/boost
dev-libs/hyphen
dev-libs/libxml2
dev-qt/qtcore:4
dev-qt/qtgui:4
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:2
media-libs/libpng:0
media-libs/tiff:0
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
cairo? ( x11-libs/cairo[X,svg] )
!cairo? ( media-libs/libart_lgpl )
hunspell? ( app-text/hunspell )
pdf? ( app-text/podofo )
scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
"
RDEPEND="${COMMON_DEPEND}
app-text/ghostscript-gpl"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.2-docs.patch
"${FILESDIR}"/${PN}-1.4.0-minizip.patch
"${FILESDIR}"/${P}-ppc64-fpic.patch
)
src_prepare() {
cat > cmake/modules/FindZLIB.cmake <<- EOF
find_package(PkgConfig)
pkg_check_modules(ZLIB minizip zlib)
SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
EOF
rm scribus/{ioapi,unzip}.[ch] || die
sed \
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-i resources/templates/CMakeLists.txt || die
cmake-utils_src_prepare
}
src_configure() {
local lang langs
for lang in ${IUSE_LINGUAS}; do
if use linguas_${lang}; then
langs+=",${lang}"
else
sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
fi
done
local mycmakeargs=(
-DHAVE_PYTHON=ON
-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DWANT_NORPATH=ON
-DWANT_QT3SUPPORT=OFF
-DGENTOOVERSION=${PVR}
-DWANT_GUI_LANG=${langs#,}
$(cmake-utils_use_with pdf PODOFO)
$(cmake-utils_use_want cairo)
$(cmake-utils_use_want !cairo QTARTHUR)
$(cmake-utils_use_want debug DEBUG)
$(cmake-utils_use_want minimal NOHEADERINSTALL)
$(cmake-utils_use_want hunspell HUNSPELL)
$(cmake-utils_use_want !examples NOEXAMPLES)
$(cmake-utils_use_want !templates NOTEMPLATES)
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
local lang file
for lang in ${IUSE_LINGUAS}; do
file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
if ! use linguas_${lang} && [[ -f "${file}" ]]; then
rm "${file}" || die
fi
done
if ! use scripts; then
rm "${ED}"/usr/share/scribus/scripts/*.py || die
elif ! use tk; then
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
python_fix_shebang "${ED}"/usr/share/scribus/scripts
python_optimize "${ED}"/usr/share/scribus/scripts
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
cat >> "${T}"/COPYING <<- EOF
${PN} is licensed under the "${LICENSE}".
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
EOF
dodoc "${T}"/COPYING
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
doicon resources/icons/scribus.png
domenu scribus.desktop
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 hppa ppc ppc64 ~sparc ~x86"
KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}

@ -1,4 +1,2 @@
DIST skrooge-1.10.0.tar.bz2 12813255 SHA256 aae15e7abf91a7fc217247d3ae5e672f4215a9090f12389cddab68fe5a175c67 SHA512 ff6137208aaacd01ee4f5a9897f69da1c40b168e9711479d0cc06c8e2f0880b5345d5f452ed5aaf53034bf773d06b7d8810166d751f10e9e90a1204429e0369a WHIRLPOOL 4f10e1f6825325f37e8154fb940df2cbea4b813c2c85a11520778b73d8d44435ccb87687139daa85a2a9d2df56c4beee777404f786df5815eef6ac6e0ed46598
DIST skrooge-1.12.5.tar.xz 11727312 SHA256 8050f8aa767743edf6aad3b4c39bfd8962412e10d9c5578c02d0ce6306a8d3d6 SHA512 5612378a57872065c4ebfff0fabca74a9a0df116fc493643bc01a08c2627a8fb45025221ce5b2123b49d2daffa57ea543312192ecfe96aa3189db7ea4c07fe90 WHIRLPOOL ce99a61896d28699d66f9a17e3ccbccfde0d58cb9106b3919a219dd07a4d5650009e75a965600ec2444e51df43e0d918f1badf484d63b2353838fa490a98be52
DIST skrooge-2.1.1.tar.xz 16928564 SHA256 4c7b82991b56d28274b7e00c2909009c858b43f489c401a46a2dca637caccd12 SHA512 97640b09d2f745dbd18cc6213b17216e63f783876fa480a0cd7f6a1062145b6a701d301d607d108caea4ae2475ed174f06f8552617b961e9985d2a268d47df7c WHIRLPOOL 2ed6d5810513bad8eac4ff6e7b7310d16f8d60b1eecbaa2f3098290cd8aeb3847a0c7e63baaf847adcce438623958a5ee8922264996da019822a106eb4014bf0
DIST skrooge-2.2.0.tar.xz 16936804 SHA256 c711a63cff0874fdb0c9a1be954d6013dc77cafc30e779252fc50533ebae7eef SHA512 cf341b7d1e2302fbf8da569da42d9f26e0e5c8ce492ba41ffda27593a235d3e15037af9683b506450ebab12ab3129f83ddb4ac58d69b295e54ccb5eada3dfb1b WHIRLPOOL 881dfb2d7a987f51cd7d0819807de6380793f06a2a20e64da3e4e667410bde10c6d25fe53360d13fe03b297b30015dd2ac868af00a8132ed044c283a4a4566e2

@ -1,46 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia
it ja ko lt mr ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
KDE_HANDBOOK="optional"
inherit kde4-base
DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
HOMEPAGE="http://www.skrooge.org/"
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
$(add_kdeapps_dep kdepimlibs)
app-crypt/qca:2[qt4(+)]
dev-db/sqlite:3
dev-libs/grantlee:0
>=dev-libs/libofx-0.9.1
dev-libs/qjson
dev-qt/qtsql:4[sqlite]
"
RDEPEND="${DEPEND}
$(add_kdeapps_dep kde-dev-scripts)
"
# upstream does not ship tests in releases
if [[ ${KDE_BUILD_TYPE} != live ]]; then
RESTRICT="test"
fi
DOCS=( AUTHORS CHANGELOG README TODO )
src_test() {
local mycmakeargs=(
-DSKG_BUILD_TEST=ON
)
kde4-base_src_test
}

@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="

@ -1,100 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
KDE_GCC_MINIMAL="4.9"
KDE_HANDBOOK="true"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
HOMEPAGE="http://www.skrooge.org/"
[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
IUSE="activities crypt ofx"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kparts)
$(add_frameworks_dep krunner)
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
app-crypt/qca:2[qt5]
dev-libs/grantlee:5
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
activities? ( $(add_frameworks_dep kactivities) )
crypt? ( dev-db/sqlcipher )
!crypt? ( dev-db/sqlite:3 )
ofx? ( >=dev-libs/libofx-0.9.1 )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kdesignerplugin)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kwindowsystem)
dev-libs/boost
dev-libs/libxslt
dev-libs/qjson
dev-qt/designer:5
dev-qt/qtnetwork:5
virtual/pkgconfig
x11-misc/shared-mime-info
"
RDEPEND="${COMMON_DEPEND}
!app-office/skrooge:4
"
# upstream does not ship tests in releases
if [[ ${KDE_BUILD_TYPE} != live ]]; then
RESTRICT="test"
fi
DOCS=( AUTHORS CHANGELOG README TODO )
src_configure() {
local mycmakeargs=(
-DSKG_CIPHER=$(usex crypt)
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package ofx LibOfx)
)
kde5_src_configure
}
src_test() {
local mycmakeargs=(
-DSKG_BUILD_TEST=ON
)
kde5_src_test
}

@ -1,2 +1,3 @@
DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9
DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d
DIST portage-utils-0.61.tar.xz 526588 SHA256 9c8942529dcfd9ee5798ab6a61fd0e8d1cc42645cbf4aeeefdb2d18a13076787 SHA512 0d09901f9d0213ef4d3d1b8961185d5f748d46a06663312f382f33e39fd9d94adc97660a11f482f3c9eb771e0f4e6bfc877390e002e7c0455c9e5ad8ebf1a7a2 WHIRLPOOL 0dcce5a46bd53b39c49edecdc35b64d79d83f06a136d773808270d685895e6bcb0669ce2689c39eeccb3f3f97cb7723b58317c34865aa80605af8b88f1d44280

@ -0,0 +1,27 @@
qcache: work around missing d_type/DT_DIR
--- qcache.c
+++ qcache.c
@@ -750,13 +750,21 @@
xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
dir = opendir(catpath);
- while ((de = readdir(dir)))
+ while ((de = readdir(dir))) {
+#ifndef DT_DIR
+ struct stat s;
+ if (stat(de->d_name, &s))
+ continue;
+ if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
+#else
if (de->d_type == DT_DIR && de->d_name[0] != '.') {
+#endif
bool ok;
allcats = add_set_unique(de->d_name, allcats, &ok);
if (ok)
++numcat;
}
+ }
closedir(dir);
free(catpath);

@ -0,0 +1,79 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit flag-o-matic toolchain-funcs eutils
DESCRIPTION="small and fast portage helper tools written in C"
HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
RDEPEND="dev-libs/iniparser:0"
DEPEND="${RDEPEND}
app-arch/xz-utils
static? ( dev-libs/iniparser:0[static-libs] )"
src_prepare() {
epatch "${FILESDIR}"/${P}-solaris.patch
epatch_user
}
src_configure() {
use static && append-ldflags -static
# Avoid slow configure+gnulib+make if on an up-to-date Linux system
if use prefix || ! use kernel_linux || \
has_version '<sys-libs/glibc-2.10'
then
econf --with-eprefix="${EPREFIX}"
else
tc-export CC
fi
}
src_compile() {
emake NLS=$(usex nls)
}
src_install() {
default
exeinto /etc/portage/bin
doexe "${FILESDIR}"/post_sync
insinto /etc/portage/postsync.d
doins "${FILESDIR}"/q-reinitialize
# Portage fixes shebangs, we just need to fix the paths in the files
sed -i \
-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
"${ED}"/etc/portage/bin/post_sync \
"${ED}"/etc/portage/postsync.d/q-reinitialize || die
}
pkg_preinst() {
# preserve +x bit on postsync files #301721
local x
pushd "${ED}" >/dev/null
for x in etc/portage/postsync.d/* ; do
[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
done
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
elog "If you wish for it to be automatically run at the end of every --sync:"
elog " # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
elog "Normally this should only take a few seconds to run but file systems"
elog "such as ext3 can take a lot longer. To disable, simply do:"
elog " # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
fi
}

@ -1 +1,2 @@
DIST posh_0.12.5.tar.xz 267356 SHA256 adf1b5670b9978c3b6d5ae64356be72d8c31db1750a7600ff981fec3ff920a0a SHA512 03fabb32eb2cd38b90cf4bef641a9ce35e3e79a65b22bf6c8654b0da9d05385efe1fb5c0274deba9c616c7aba443f9a408194a066983edf051be1098be11f21e WHIRLPOOL 7a6275c14818cc24085e9383e9fce51dbb71ebdb001af2a7f5bc061a807e4681f83f57a6a2aa5bac4655d8f24466e9a7f0e573c584d04e660a668995d0144b8f
DIST posh_0.12.tar.gz 469680 SHA256 9206b67005cf357404b3f3021c2d7c7bbd50756050512dececb9ed836435b048 SHA512 bb98d2fa009b5ccd666103378dd30da5649baf830d4e3124575f813b98b13275bde46e03bb737c75b37c82f655b3f17e9a5decd29b75d20678e78a4d7e3abf00 WHIRLPOOL ffd03e1537aa8e68545c532fb8c27fc9702ab16157efce7ef5c83b6f70fbe1a807e4759b85525036ae0c26f56b595ccf95d9cffb8a96b4ef8e5a8ec4b50c60e6

@ -0,0 +1,37 @@
From 893b644fc8c840d0a29974c90e0a80f7ce8146ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 14 Feb 2016 10:21:02 +0100
Subject: [PATCH] tests/th: Update to work with perl-5.16+
The 'getopts.pl' module (dating back to perl4) was finally nuked in
perl-5.16+, therefore making it impossible to run tests in posh. Use
the perl5 Getopt::Std module instead.
---
tests/th | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/th b/tests/th
index 72eb812..920d54c 100755
--- a/tests/th
+++ b/tests/th
@@ -130,7 +130,7 @@
$os = defined $^O ? $^O : 'unknown';
-require 'getopts.pl';
+use Getopt::Std;
($prog = $0) =~ s#.*/##;
@@ -200,7 +200,7 @@ $nxpassed = 0;
%known_tests = ();
-if (!&Getopts('C:p:Ps:t:ve:')) {
+if (!&getopts('C:p:Ps:t:ve:')) {
print STDERR $Usage;
exit 1;
}
--
2.7.1

@ -0,0 +1,34 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools
DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
HOMEPAGE="http://packages.debian.org/posh"
SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="app-arch/xz-utils"
src_prepare() {
eapply "${FILESDIR}/${P}-test-perl-fix.patch"
default
# tarball bundles outdated generated files
eautoreconf
}
src_configure() {
local myconf=(
--exec-prefix=/
)
econf "${myconf[@]}"
}

@ -1,3 +1,3 @@
DIST dos2unix-7.3.1.tar.gz 552530 SHA256 f4d5df24d181c2efecf7631aab6e894489012396092cf206829f1f9a98556b94 SHA512 8bfe2ed739f5b28ceddbcd33e8a214b1cbc4b02ddab6f0528d050c411754365b6b7314a857a45cefaf13f719ad86a1fe7c18841e63f851f7f4c9e586cfa4f0fd WHIRLPOOL 5eae8985f5aeabe82230cf9451509469323a3c97e9a256bb6a31e82b77e9d2ac74c88d87147e6feeff9f088a48b9df910f900f9f952bf17809f07ee7478ce060
DIST dos2unix-7.3.2.tar.gz 601642 SHA256 c7e8ee0bb3e001cc25a4a908d9a81ac52d124133d6a524a59f995bc90d438689 SHA512 3d042e720c9854ae42ef72d1acf78ff8ff1cbf3c259d2c8bdba0a0b9cbf754fbe2dee9994cb9513cf1df24f26a857a13e828f0c88dc2e50f91e1c33a122eb385 WHIRLPOOL 48652bae9b247f68d9d246ad6e1c9758c04f61de3816126b89bd928bb1e50435b384d05c63a070b851d02657c698d7fbb6de61c1998a9b3d8ed32e0a3354e7ab
DIST dos2unix-7.3.3.tar.gz 638368 SHA256 5c910aea2eae96663c67e87627998c4fe3cded403be5819b4c190e56c82ff0fb SHA512 52218ea17cc63a4b41e1bd12f200dda31e2be65167ca9c913391640c118d7122348aa2e5aec934ee17c8ea77a04cb89a1a572865645a77f6875207295c10e7af WHIRLPOOL 749cabc6d2d57caccf183082689a0d677d7d5b7822c8a92a85a5b2d722284542c95dcd46947ea05a1d2cff1d230351cacf1f0667957f18c7c02c12c6c62f2e16
DIST dos2unix-7.3.tar.gz 497218 SHA256 8175f7552a72edaaa8918fdee68ce2cbc982dc25452f33d4dc611d769f4944d1 SHA512 dc70fc4cf12811794e9b33db7cc44085788450104f7beefacea5ac11af5ca76d909235232be51eb7a32ed5d75a01a86a4c6b064060b945c8a7e7968caeb51cea WHIRLPOOL 55b3990816a122c4bc2219b1f89b5d7f619901693b57349b58222166f5c3e006db08a55a26ce62493009459b9a3c6a091a07ecacabf9450a0a7475fbd9f195ae

@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
inherit eutils toolchain-funcs
inherit toolchain-funcs
DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
@ -28,6 +28,8 @@ DEPEND="
dev-lang/perl"
src_prepare() {
default
sed \
-e '/^LDFLAGS/s|=|+=|' \
-e '/CFLAGS_OS \+=/d' \

@ -124,6 +124,10 @@ src_prepare() {
sed -i \
-e "/^ZLIBDIR=/s:=.*:=${T}:" \
configure.ac || die
# Some files depend on zlib.h directly. Redirect them. #573248
sed -i \
-e '/^zlib_h/s:=.*:=:' \
base/lib.mak || die
# search path fix
# put LDFLAGS after BINDIR, bug #383447

@ -1,3 +1 @@
DIST kbibtex-0.5.1.tar.xz 250224 SHA256 8e3717721ecf29a864142df302f8c6a029704c10832b3926fd42b19d315b6284 SHA512 e1e36f750a26196f8c0f07b51084afa69080fb57b747a98b0bc4ec16d733603b64dd0cc23b44a470467b0e7f705d7aef4c36c2171ceadaa3afd109fdfab56e55 WHIRLPOOL c0358164611fdf4526148205a9bc69dcc213ff7f6d68a92fa301c3bf934cf89b198f23aa568b956938e04eaaf54e1838cab89e977151043b205b9127da4d5be7
DIST kbibtex-0.5.2.tar.xz 250092 SHA256 c1577e18e3bbf745cccdace537e84d3e1dc957330affac8b441e6f9cfc120d38 SHA512 1973ba4fe366605db17c01ee8df5c0a79231351fad20e3243cd4040d7499f4f7af43abf60df8f654c91bdf2e2051299f16f40aa90761f5cae8c1e6d97ea90827 WHIRLPOOL e951e5c4eb2f1d7986dfdc7c973f77b75b818d6c8a8fc8590ecedc306263b4b53a18be0203384dda3b18c262d5e43bb3da6f698fa1091b0e80f62d79aa9fff5d
DIST kbibtex-0.6.tar.xz 2430176 SHA256 fc67a376f05105f14a0bee595bfd073a1ef2c7f9fc6be35dc620bb34f3bd9656 SHA512 a6943271df529c15be8a3112ccbe2c64ccff4cc942c846f00447f7a40bb3e6a6408af12fafe201143a8cf0288ec5ea13da1abab5d870fea6d0516bf5c4543b60 WHIRLPOOL e679f3907fb3041e0680aee1f3f7e0a299fce648c5c1b81663de49ce9d77351dfde8165048cd92c2a5ba7139f8d67d5a9a4eb5f37c393e19006fba4bd5dcd98e

@ -1,32 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit versionator kde4-base
DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
HOMEPAGE="http://home.gna.org/kbibtex/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
KEYWORDS="amd64 x86"
else
EGIT_BRANCH="${PN}/$(get_version_component_range 1-2)"
KEYWORDS=""
fi
LICENSE="GPL-2"
SLOT="4"
IUSE="debug"
DEPEND="
app-text/poppler[qt4]
dev-libs/libxml2
dev-libs/libxslt
virtual/tex-base
"
RDEPEND="${DEPEND}
dev-tex/bibtex2html"
S=${WORKDIR}/${P/_/-}

@ -1,26 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit kde4-base versionator
DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
HOMEPAGE="http://home.gna.org/kbibtex/"
SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="
app-text/poppler[qt4]
dev-libs/libxml2
dev-libs/libxslt
virtual/tex-base
"
RDEPEND="${DEPEND}
dev-tex/bibtex2html
"

@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="

@ -13,7 +13,6 @@
<longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
It is designed to edit books in ePub format.</longdescription>
<upstream>
<remote-id type="google-code">sigil</remote-id>
<remote-id type="github">user-none/Sigil</remote-id>
<remote-id type="github">Sigil-Ebook/Sigil</remote-id>
</upstream>
</pkgmetadata>

@ -1 +1,2 @@
DIST trang-20091111.zip 1079534 SHA256 d8a3f034f9918ebe5b265aafeadbee6729ddda5732cfc368e2c30b3b8c0ca598 SHA512 c19bf98613097d377ecce347dcab31b458b16d77c320b5d2a6106ff7b06b3aa3c7b87b4c78376b3d4f89be24ecb11fad622aadc0ba9d8d6be716486d7a1ebd7b WHIRLPOOL 6ed18632dfdb7c9661fcb6e1b3a02130ac877fdda3c4cc7779ec61510a7e67e68ab7315ab6f3e5cb8ed2a83447873579791c568f7706eaab29f5e2258fa5bc3b
DIST trang-20151127.tar.gz 13746141 SHA256 86c810a42d974665d12db5213943cd72fcb6912d80b5a2853e083bc454ca6b75 SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26 WHIRLPOOL c11781da0cf8d5deada8c59dcfbc13dffd78e045c97b4b27768d8772563b989e9c6434fa4be13ea3c53574ad59baf0eb3a150bc3d77edc7336315f6961fb0b6c

@ -6,6 +6,7 @@
<name>Java</name>
</maintainer>
<upstream>
<remote-id type="github">relaxng/jing-trang</remote-id>
<remote-id type="google-code">jing-trang</remote-id>
</upstream>
</pkgmetadata>

@ -1,61 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Multi-format schema converter based on RELAX NG"
HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
SRC_URI="https://jing-trang.googlecode.com/files/${P}.zip"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEP="
dev-java/xerces:2
dev-java/xml-commons-resolver:0"
RDEPEND="
>=virtual/jre-1.6
${COMMON_DEP}"
DEPEND="
app-arch/unzip
>=virtual/jdk-1.6
${COMMON_DEP}"
java_prepare() {
# need resource files in jar archive so can't remove, see build.xml
# rm -v *.jar || die "Failed to remove jar archives"
cp "${FILESDIR}/build.xml" "${S}/build.xml" || die
}
EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
src_test() {
java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.xsd"
java -jar "dist/${PN}.jar" "${FILESDIR}/test.xml" "test/test.dtd"
java -jar "dist/${PN}.jar" "test/test.dtd" "test/test.dtd.xsd"
md5sum -c <<MD5SUMS_END || die "Failed to verify md5sum"
4bcb454ade46c0188f809d2e8ce15315 "${FILESDIR}"/test.xml
d096c1fb462902e10a3440a604a21664 test/test.xsd
3fb46bdb16dc75a2a1e36e421b13e51d test/test.dtd
fce355ca962cb063d7baa5d7fd571bcf test/test.dtd.xsd
MD5SUMS_END
}
src_install() {
java-pkg_dojar "dist/${PN}.jar"
java-pkg_dolauncher trang \
--main com.thaiopensource.relaxng.translate.Driver
dohtml *.html || die
use doc && java-pkg_dojavadoc javadoc
use source && java-pkg_dosrc src/{org,com}
}

@ -0,0 +1,80 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Multi-format schema converter based on RELAX NG"
HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
COMMON_DEP="
dev-java/xerces:2
dev-java/xml-commons-resolver:0"
RDEPEND="
>=virtual/jre-1.7
${COMMON_DEP}"
DEPEND="
>=virtual/jdk-1.7
dev-java/javacc:0
dev-java/saxon:6.5
dev-java/testng:0
${COMMON_DEP}"
S="${WORKDIR}/jing-${PN}-${COMMIT}"
EANT_ANT_TASKS="testng"
EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
JAVA_ANT_REWRITE_CLASSPATH="yes"
JAVA_PKG_BSFIX_NAME="build.xsl"
java_prepare() {
java-pkg_clean
echo "<version>${PV}</version>" > version.xml || die
}
src_configure() {
java-ant-2_src_configure
# Because this crazy package uses XSLT, we need to escape this.
sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
EANT_EXTRA_ARGS="-Djavacc.dir=${EROOT}usr/share/javacc/lib"
export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
}
src_compile() {
EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
}
src_install() {
java-pkg_dojar build/${PN}.jar
java-pkg_dolauncher ${PN} \
--main com.thaiopensource.relaxng.translate.Driver
docinto html
dodoc build/*.html
}
src_test() {
java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd
java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd
java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd
md5sum -c <<EOF || die "Failed to verify md5sum"
4bcb454ade46c0188f809d2e8ce15315 ${FILESDIR}/test.xml
d096c1fb462902e10a3440a604a21664 test/test.xsd
3fb46bdb16dc75a2a1e36e421b13e51d test/test.dtd
fce355ca962cb063d7baa5d7fd571bcf test/test.dtd.xsd
EOF
}

@ -1,5 +1,3 @@
DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
DIST xapian-omega-1.2.21.tar.xz 435624 SHA256 862d3a5d7052fc13c16eed51c42d774c4ab1c56967c477d994995b753dc9527e SHA512 8aa669fbf3253b72e742bed93a9ec972e33f49327cf0e912a21b33e3f586cf35041a50f107fe4767f8906996e86f8a6126efc8232e72045e8243b0ab1b30e1e9 WHIRLPOOL 8a6b555ef6eeacbca24b2c80468b3195eacc66084243d0340709a6c556cb03009022b8716b5e2aef0f6c382aaf5dbec8f29a01589808170fa26e73ccc988bdff
DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
DIST xapian-omega-1.3.3.tar.xz 464308 SHA256 d28c05d5c920dae142fe69abec074b7916f027d749d2d0290d04133d2d6ad6f0 SHA512 4ea980b96526e1bc88329991e34b174944c8f87ba1b0d0f199bb2c7545ce80bc5307935d8322b6e8fa48b28dc6ead728fc5bebe7e13758602f952eac60302dd5 WHIRLPOOL b748a27225d097e3dca6d25935cbc40da5905795efc302affe13a3ba015b5fc1c15eef69e4d0ea460378f7aac6cce5896073ebb6856d46d6651a97bd626d3a39
DIST xapian-omega-1.3.4.tar.xz 482924 SHA256 f6f31bd46194703adc317cfdbd62ce423fc2f9c96b7b1c9fb2a6bfa2f88779d7 SHA512 5c675d756af271a237182ba0bfd11c453725800adde829bad453d2a3e01144cc12226fc7fcffde0c799fdfc697222ba64de7ebbf5834ec300e6f39985db269d9 WHIRLPOOL 7dfabc7a3fdd9a5d4dc59151862183e4655149c74a291ab585322214fb0caab2e172da11a1bc678ba7bbe352eac4212c785ad4152516b677a68360fac9d4aa37

@ -1,30 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
HOMEPAGE="http://www.xapian.org/"
S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=">=dev-libs/xapian-${PV}
dev-lang/perl
dev-libs/libpcre
sys-libs/zlib"
RDEPEND="${DEPEND}"
src_install () {
emake DESTDIR="${D}" install
#move docs to /usr/share/doc/${PF}.
mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -11,10 +11,10 @@ S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE=""
DEPEND="~dev-libs/xapian-${PV}
DEPEND="dev-libs/xapian:0/1.2.22
dev-lang/perl
dev-libs/libpcre
sys-libs/zlib"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save