Browse Source

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

mhiretskiy 229
root 6 years ago
parent
commit
2a31e7df0e
  1. 1
      app-admin/conky/Manifest
  2. 183
      app-admin/conky/conky-1.10.0.ebuild
  3. 4
      app-admin/conky/conky-1.10.1.ebuild
  4. 2
      app-admin/conky/conky-1.9.0-r3.ebuild
  5. 2
      app-admin/puppetdb/puppetdb-3.2.3.ebuild
  6. 2
      app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
  7. 1
      app-arch/mt-st/Manifest
  8. 25
      app-arch/mt-st/mt-st-1.2.ebuild
  9. 2
      app-arch/xz-utils/xz-utils-5.2.2.ebuild
  10. 66
      app-cdr/cdrdao/cdrdao-1.2.3-r3.ebuild
  11. 418
      app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
  12. 4
      app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
  13. 173
      app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch
  14. 2
      app-cdr/cdrtools/Manifest
  15. 0
      app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
  16. 136
      app-crypt/gnupg/files/gnupg-2.1.11-tests.patch
  17. 174
      app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
  18. 2
      app-crypt/keybase/keybase-0.8.25.ebuild
  19. 2
      app-doc/elisp-manual/elisp-manual-24.5.ebuild
  20. 2
      app-doc/pms/Manifest
  21. 45
      app-doc/pms/pms-5-r2.ebuild
  22. 2
      app-doc/pms/pms-6_p20151113.ebuild
  23. 2
      app-editors/emacs/emacs-23.4-r14.ebuild
  24. 5
      app-editors/nano/Manifest
  25. 38
      app-editors/nano/files/awk.nanorc
  26. 9
      app-editors/nano/files/css.nanorc
  27. 50
      app-editors/nano/files/gentoo.nanorc
  28. 88
      app-editors/nano/files/nano-2.4.0-no-speller.patch
  29. 9
      app-editors/nano/files/xml.nanorc
  30. 79
      app-editors/nano/nano-2.3.6.ebuild
  31. 80
      app-editors/nano/nano-2.4.0.ebuild
  32. 79
      app-editors/nano/nano-2.4.1.ebuild
  33. 0
      app-editors/nano/nano-2.5.2.ebuild
  34. 2
      app-editors/qemacs/qemacs-0.4.1_pre20150916.ebuild
  35. 2
      app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
  36. 1
      app-emacs/mmm-mode/Manifest
  37. 32
      app-emacs/mmm-mode/mmm-mode-0.5.1.ebuild
  38. 2
      app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
  39. 1
      app-forensics/afflib/Manifest
  40. 66
      app-forensics/afflib/afflib-3.7.7.ebuild
  41. 2
      app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
  42. 1
      app-misc/gcalcli/Manifest
  43. 29
      app-misc/gcalcli/gcalcli-3.3.2.ebuild
  44. 1
      app-misc/tmux-mem-cpu-load/Manifest
  45. 38
      app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.1.0.ebuild
  46. 2
      app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
  47. 26
      app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1.ebuild
  48. 1
      app-mobilephone/anyremote/Manifest
  49. 26
      app-mobilephone/anyremote/anyremote-6.4.ebuild
  50. 2
      app-mobilephone/anyremote/anyremote-6.5.ebuild
  51. 4
      app-office/calligra/calligra-2.8.5.ebuild
  52. 4
      app-office/calligra/calligra-2.8.7.ebuild
  53. 4
      app-office/calligra/calligra-2.9.10.ebuild
  54. 2
      app-office/calligra/calligra-2.9.11.ebuild
  55. 4
      app-office/calligra/calligra-2.9.6.ebuild
  56. 4
      app-office/calligra/calligra-2.9.7.ebuild
  57. 4
      app-office/calligra/calligra-9999.ebuild
  58. 1
      app-office/kraft/Manifest
  59. 29
      app-office/kraft/kraft-0.58.ebuild
  60. 6
      app-office/kraft/kraft-0.59.ebuild
  61. 98
      app-office/passepartout/ChangeLog-2015
  62. 1
      app-office/passepartout/Manifest
  63. 45
      app-office/passepartout/files/passepartout-0.6-extra_qual.patch
  64. 13
      app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch
  65. 14
      app-office/passepartout/files/passepartout-0.7.0-gcc42.patch
  66. 97
      app-office/passepartout/files/passepartout-0.7.0-gcc43.patch
  67. 109
      app-office/passepartout/files/passepartout-0.7.0-gcc44.patch
  68. 140
      app-office/passepartout/files/passepartout-0.7.0-include-flags.patch
  69. 293
      app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch
  70. 11
      app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch
  71. 13
      app-office/passepartout/files/passepartout-0.7.0-safer.patch
  72. 4
      app-office/passepartout/metadata.xml
  73. 92
      app-office/passepartout/passepartout-0.7.0-r1.ebuild
  74. 1
      app-office/scribus/Manifest
  75. 150
      app-office/scribus/scribus-1.4.4-r1.ebuild
  76. 2
      app-office/scribus/scribus-1.4.5.ebuild
  77. 2
      app-office/skrooge/Manifest
  78. 46
      app-office/skrooge/skrooge-1.10.0.ebuild
  79. 2
      app-office/skrooge/skrooge-1.12.5.ebuild
  80. 100
      app-office/skrooge/skrooge-2.1.1.ebuild
  81. 1
      app-portage/portage-utils/Manifest
  82. 27
      app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
  83. 79
      app-portage/portage-utils/portage-utils-0.61.ebuild
  84. 1
      app-shells/posh/Manifest
  85. 37
      app-shells/posh/files/posh-0.12.5-test-perl-fix.patch
  86. 34
      app-shells/posh/posh-0.12.5.ebuild
  87. 2
      app-text/dos2unix/Manifest
  88. 60
      app-text/dos2unix/dos2unix-7.3.1.ebuild
  89. 62
      app-text/dos2unix/dos2unix-7.3.3.ebuild
  90. 4
      app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild
  91. 2
      app-text/kbibtex/Manifest
  92. 32
      app-text/kbibtex/kbibtex-0.5.1.ebuild
  93. 26
      app-text/kbibtex/kbibtex-0.5.2.ebuild
  94. 2
      app-text/kbibtex/kbibtex-0.6.ebuild
  95. 3
      app-text/sigil/metadata.xml
  96. 1
      app-text/trang/Manifest
  97. 1
      app-text/trang/metadata.xml
  98. 61
      app-text/trang/trang-20091111-r1.ebuild
  99. 80
      app-text/trang/trang-20151127.ebuild
  100. 2
      app-text/xapian-omega/Manifest

1
app-admin/conky/Manifest

@ -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

183
app-admin/conky/conky-1.10.0.ebuild

@ -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
}

4
app-admin/conky/conky-1.10.1.ebuild

@ -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

2
app-admin/conky/conky-1.9.0-r3.ebuild

@ -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$

2
app-admin/puppetdb/puppetdb-3.2.3.ebuild

@ -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+=""

2
app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild

@ -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
app-arch/mt-st/Manifest

@ -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

25
app-arch/mt-st/mt-st-1.2.ebuild

@ -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
}

2
app-arch/xz-utils/xz-utils-5.2.2.ebuild

@ -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

66
app-cdr/cdrdao/cdrdao-1.2.3-r3.ebuild

@ -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)
}

418
app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch

@ -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])
+])

4
app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch

@ -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>

173
app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch

@ -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) \

2
app-cdr/cdrtools/Manifest

@ -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
app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild → app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild

136
app-crypt/gnupg/files/gnupg-2.1.11-tests.patch

@ -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

174
app-crypt/gnupg/gnupg-2.1.11-r1.ebuild

@ -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
}

2
app-crypt/keybase/keybase-0.8.25.ebuild

@ -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="

2
app-doc/elisp-manual/elisp-manual-24.5.ebuild

@ -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"

2
app-doc/pms/Manifest

@ -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

45
app-doc/pms/pms-5-r2.ebuild

@ -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
}

2
app-doc/pms/pms-6_p20151113.ebuild

@ -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? (

2
app-editors/emacs/emacs-23.4-r14.ebuild

@ -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 )"

5
app-editors/nano/Manifest

@ -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

38
app-editors/nano/files/awk.nanorc

@ -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:]]+$"

9
app-editors/nano/files/css.nanorc

@ -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 ";|:|\{|\}"

50
app-editors/nano/files/gentoo.nanorc

@ -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 "#.*$"

88
app-editors/nano/files/nano-2.4.0-no-speller.patch

@ -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

9
app-editors/nano/files/xml.nanorc

@ -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 "&[^;]*;"

79
app-editors/nano/nano-2.3.6.ebuild

@ -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
}

80
app-editors/nano/nano-2.4.0.ebuild

@ -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