Fix suggestions and bugs spotted by zlin

https://galileo.mailstation.de/gerrit/#/c/5864/
This commit is contained in:
Julian Ospald 2016-05-13 22:41:29 +02:00
parent 8b1c24e748
commit 22a67e22f1
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
32 changed files with 54 additions and 75 deletions

View File

@ -30,7 +30,7 @@ here_desktop_entry() {
doins "${TEMP}/${1}" doins "${TEMP}/${1}"
) )
if ! desktop-file-validate ${IMAGE}/usr/share/applications/${1} ; then if ! desktop-file-validate "${IMAGE}/usr/share/applications/${1}" ; then
eerror "${1} does not pass desktop file validation" eerror "${1} does not pass desktop file validation"
die_unless_nonfatal "${1} does not pass desktop file validation" die_unless_nonfatal "${1} does not pass desktop file validation"
fi fi

View File

@ -21,7 +21,7 @@ SLOT="0"
PLATFORMS="~amd64 ~x86" PLATFORMS="~amd64 ~x86"
MYOPTIONS=" MYOPTIONS="
gnome gnome [[ description = [ Compile with gnome3 support ] ]]
pulseaudio pulseaudio
xfce4-panel [[ description = [ Add support for XFCE panel ] ]] xfce4-panel [[ description = [ Add support for XFCE panel ] ]]
" "

View File

@ -31,8 +31,6 @@ DEFAULT_SRC_INSTALL_PARAMS=(
) )
DEFAULT_SRC_INSTALL_EXTRA_DOCS=( DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
README.md
CHANGELOG.md
CONTRIBUTING.md CONTRIBUTING.md
) )

View File

@ -18,7 +18,6 @@ DEPENDENCIES="
WORK=${WORKBASE}/sdk WORK=${WORKBASE}/sdk
src_compile() { src_compile() {
export CXX=${CXX} AR=${AR} RANLIB=${RANLIB}
emake -C ${PN}/projects/gnuc \ emake -C ${PN}/projects/gnuc \
LIBRARYDEST= LIBRARYDEST=
} }

View File

@ -16,7 +16,9 @@ PLATFORMS="~amd64 ~x86"
MYOPTIONS=" MYOPTIONS="
havege [[ description = [ Enable the HAVEGE random generator, havege [[ description = [ Enable the HAVEGE random generator,
not suitable for virtualized environments! ] ]] not suitable for virtualized environments! ] ]]
threads threads [[ description = [ Enables the threading abstraction layer
via pthread. This is used if you do intend
to use contexts between threads. ] ]]
x86_cpu_features: x86_cpu_features:
sse2 sse2
" "
@ -25,7 +27,7 @@ DEPENDENCIES="
build+run: build+run:
sys-libs/zlib sys-libs/zlib
test: test:
dev-lang/perl dev-lang/perl:*
" "
CMAKE_SRC_CONFIGURE_PARAMS=( CMAKE_SRC_CONFIGURE_PARAMS=(

View File

@ -16,7 +16,7 @@ DEPENDENCIES="
run: run:
dev-python/python-application[python_abis:*(-)?] dev-python/python-application[python_abis:*(-)?]
dev-python/python-eventlib[python_abis:*(-)?] dev-python/python-eventlib[python_abis:*(-)?]
dev-python/python-gnutls[python_abis:*(-)?][>=3.0.0] dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
net-twisted/TwistedCore[python_abis:*(-)?] net-twisted/TwistedCore[python_abis:*(-)?]
net-twisted/TwistedNames[python_abis:*(-)?] net-twisted/TwistedNames[python_abis:*(-)?]
" "

View File

@ -20,7 +20,7 @@ DEPENDENCIES="
virtual/pkg-config virtual/pkg-config
build+run: build+run:
dev-db/sqlite:3 dev-db/sqlite:3
dev-python/python-application[python_abis:*(-)?][>=2.0.0] dev-python/python-application[>=2.0.0][python_abis:*(-)?]
media-libs/libvpx media-libs/libvpx
media-libs/v4l-utils media-libs/v4l-utils
media/ffmpeg[h264] media/ffmpeg[h264]
@ -36,7 +36,7 @@ DEPENDENCIES="
dev-python/python-dateutil[python_abis:*(-)?] dev-python/python-dateutil[python_abis:*(-)?]
dev-python/python-eventlib[python_abis:*(-)?] dev-python/python-eventlib[python_abis:*(-)?]
dev-python/python-gnutls[python_abis:*(-)?] dev-python/python-gnutls[python_abis:*(-)?]
dev-python/python-msrplib[python_abis:*(-)?][>=0.19.0] dev-python/python-msrplib[>=0.19.0][python_abis:*(-)?]
dev-python/python-otr[python_abis:*(-)?] dev-python/python-otr[python_abis:*(-)?]
dev-python/python-xcaplib[python_abis:*(-)?] dev-python/python-xcaplib[python_abis:*(-)?]
dev-python/zopeinterface[python_abis:*(-)?] dev-python/zopeinterface[python_abis:*(-)?]

View File

@ -88,6 +88,6 @@ src_install() {
dobin gambatte_sdl/gambatte_sdl dobin gambatte_sdl/gambatte_sdl
option qt4 && dobin gambatte_qt/bin/gambatte_qt option qt4 && dobin gambatte_qt/bin/gambatte_qt
nonfatal dodoc README changelog nonfatal emagicdocs
} }

View File

@ -3,7 +3,7 @@
# Purpose: an exlib dealing with installation of the love engine # Purpose: an exlib dealing with installation of the love engine
# Maintainer: Julian Ospald <hasufell@posteo.de> # Maintainer: Julian Ospald <hasufell@posteo.de>
# Exports: src_prepare src_install pkg_postinst # Exports: src_prepare src_install
# Side-effects: - adds build and runtime dependencies # Side-effects: - adds build and runtime dependencies
# - sets $SUMMARY, $HOMEPAGE, $DOWNLOADS, $LICENCES, # - sets $SUMMARY, $HOMEPAGE, $DOWNLOADS, $LICENCES,
# $DEFAULT_SRC_CONFIGURE_PARAMS, # $DEFAULT_SRC_CONFIGURE_PARAMS,
@ -22,7 +22,7 @@ if [[ -n ${LOVE_AUTOCONF} ]]; then
require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ] require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
fi fi
export_exlib_phases src_prepare src_install pkg_postinst export_exlib_phases src_prepare src_install
SUMMARY="A framework for 2D games in Lua" SUMMARY="A framework for 2D games in Lua"
HOMEPAGE="http://love2d.org/" HOMEPAGE="http://love2d.org/"
@ -82,8 +82,3 @@ love_src_install() {
done done
} }
# Exported 'pkg_postinst'.
love_pkg_postinst() {
alternatives_pkg_postinst
}

View File

@ -5,7 +5,7 @@ require alternatives
require setup-py [ import=distutils multibuild=false blacklist=3 ] require setup-py [ import=distutils multibuild=false blacklist=3 ]
require gtk-icon-cache require gtk-icon-cache
export_exlib_phases src_prepare src_install pkg_postinst export_exlib_phases src_prepare src_install
SUMMARY="Visual novel engine written in python" SUMMARY="Visual novel engine written in python"
DESCRIPTION=" DESCRIPTION="
@ -104,7 +104,3 @@ EOF
done done
} }
renpy_pkg_postinst() {
alternatives_pkg_postinst
}

View File

@ -10,7 +10,7 @@ LICENCES="DUKE3D GOG-EULA"
SLOT="0" SLOT="0"
PLATFORMS="amd64 hppa ppc x86" PLATFORMS="amd64 hppa ppc x86"
MYOPTIONS="" MYOPTIONS=""
RESTRICT="mirror bindist fetch" RESTRICT="fetch"
DEPENDENCIES=" DEPENDENCIES="
build: build:

View File

@ -43,7 +43,12 @@ MYOPTIONS="
tools [[ description = [ Build several tools for modding and tools [[ description = [ Build several tools for modding and
development ] ]] development ] ]]
vpx [[ description = [ Enable support for WebM VP8 Codecs ] ]] vpx [[ description = [ Enable support for WebM VP8 Codecs ] ]]
( opl-musicpack sc55-musicpack ) [[ number-selected = at-most-one ]] (
opl-musicpack [[ description = [ Include optional OPL (AdLib)
music pack ] ]]
sc55-musicpack [[ description = [ Include optional Roland SC-55
music pack ] ]]
) [[ number-selected = at-most-one ]]
" "
DEPENDENCIES=" DEPENDENCIES="

View File

@ -46,8 +46,6 @@ src_prepare() {
} }
src_compile() { src_compile() {
export CC=${CC} CXX=${CXX} LD=${LD} AR=${AR} RANLIB=${RANLIB}
emake -C ${MY_S} \ emake -C ${MY_S} \
V=1 \ V=1 \
DEFAULT_BASEDIR="${OA_SHARE_DIR}" \ DEFAULT_BASEDIR="${OA_SHARE_DIR}" \

View File

@ -65,7 +65,7 @@ src_unpack() {
} }
src_compile() { src_compile() {
env -u TARGETS -u PLATFORM emake \ edo env -u TARGETS -u PLATFORM emake \
ARCH=$(option platform:amd64 "x86_64" "i386") \ ARCH=$(option platform:amd64 "x86_64" "i386") \
PLATFORM=linux \ PLATFORM=linux \
DEFAULT_BASEDIR="/usr/share/${PN}" \ DEFAULT_BASEDIR="/usr/share/${PN}" \

View File

@ -68,8 +68,6 @@ src_prepare() {
src_compile() { src_compile() {
local i local i
export CC=${CC} CXX=${CXX} LD=${LD} AR=${AR} RANLIB=${RANLIB}
# fixes parallel build issues # fixes parallel build issues
for i in sv-release cl-release sdl-release ; do for i in sv-release cl-release sdl-release ; do
emake \ emake \

View File

@ -11,7 +11,7 @@ PLATFORMS="-* ~amd64 ~x86"
MYOPTIONS=" MYOPTIONS="
( platform: amd64 x86 ) ( platform: amd64 x86 )
" "
RESTRICT="fetch bindist" RESTRICT="fetch"
DEPENDENCIES=" DEPENDENCIES="
run: run:

View File

@ -11,7 +11,7 @@ LICENCES="all-rights-reserved"
SLOT="0" SLOT="0"
PLATFORMS="-* ~x86" PLATFORMS="-* ~x86"
MYOPTIONS="" MYOPTIONS=""
RESTRICT="fetch bindist" RESTRICT="fetch"
DEPENDENCIES=" DEPENDENCIES="
build: build:

View File

@ -11,7 +11,7 @@ LICENCES="all-rights-reserved"
SLOT="0" SLOT="0"
PLATFORMS="-* ~x86" PLATFORMS="-* ~x86"
MYOPTIONS="" MYOPTIONS=""
RESTRICT="fetch bindist" RESTRICT="fetch"
DEPENDENCIES=" DEPENDENCIES="
build: build:

View File

@ -26,7 +26,7 @@ MYOPTIONS="
dlc2 [[ description = [ Install the Kickstarter Bonus Pet ] ]] dlc2 [[ description = [ Install the Kickstarter Bonus Pet ] ]]
dlc3 [[ description = [ Install the Pre-Order Bonus Item and Pet ] ]] dlc3 [[ description = [ Install the Pre-Order Bonus Item and Pet ] ]]
" "
RESTRICT="fetch bindist" RESTRICT="fetch"
DEPENDENCIES=" DEPENDENCIES="
build: build:

View File

@ -11,7 +11,7 @@ DOWNLOADS="manual: ${GOG_SH}"
LICENCES="all-rights-reserved GOG-EULA" LICENCES="all-rights-reserved GOG-EULA"
SLOT="0" SLOT="0"
PLATFORMS="-* ~amd64 ~x86" PLATFORMS="-* ~amd64 ~x86"
RESTRICT="fetch mirror" RESTRICT="fetch"
MYOPTIONS=" MYOPTIONS="
( platform: amd64 x86 ) ( platform: amd64 x86 )

View File

@ -21,9 +21,7 @@ DOWNLOADS=""
LICENCES="GPL-2 GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-3.0 CC0 OFL-1.1" LICENCES="GPL-2 GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-3.0 CC0 OFL-1.1"
SLOT="0" SLOT="0"
PLATFORMS="~amd64 ~x86" PLATFORMS="~amd64 ~x86"
MYOPTIONS=" MYOPTIONS=""
editor
"
DEPENDENCIES=" DEPENDENCIES="
build: build:
@ -40,7 +38,6 @@ DEPENDENCIES="
x11-dri/glu x11-dri/glu
x11-dri/mesa x11-dri/mesa
x11-libs/libX11 x11-libs/libX11
editor? ( x11-libs/qt:4[opengl] )
" "
CMAKE_SRC_CONFIGURE_PARAMS=( CMAKE_SRC_CONFIGURE_PARAMS=(
@ -49,10 +46,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DUSE_PCH_COMPILATION=OFF -DUSE_PCH_COMPILATION=OFF
) )
CMAKE_SRC_CONFIGURE_OPTIONS=(
'editor EDITOR_SUPPORT'
)
pkg_postinst() { pkg_postinst() {
gtk-icon-cache_pkg_postinst gtk-icon-cache_pkg_postinst
freedesktop-desktop_pkg_postinst freedesktop-desktop_pkg_postinst

View File

@ -11,7 +11,7 @@ LICENCES="all-rights-reserved"
SLOT="0" SLOT="0"
PLATFORMS="-* ~x86" PLATFORMS="-* ~x86"
MYOPTIONS="" MYOPTIONS=""
RESTRICT="bindist fetch mirror" RESTRICT="fetch"
DEPENDENCIES=" DEPENDENCIES="
build: build:

View File

@ -59,7 +59,7 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
) )
DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
"http zlib ${ROOT}/usr/$(exhost --target)" "http zlib /usr/$(exhost --target)"
) )
src_configure() { src_configure() {

View File

@ -20,7 +20,7 @@ DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-makefile.patch )
src_unpack() { src_unpack() {
default default
edo mv gennady-ja2-stracciatella-* ${WORK} edo mv gennady-ja2-stracciatella-* "${WORK}"
} }
src_configure() { src_configure() {

View File

@ -3,6 +3,7 @@
MY_PNV="pgl-${PV}" MY_PNV="pgl-${PV}"
require systemd-service
require gtk-icon-cache require gtk-icon-cache
require sourceforge [ project=peerguardian suffix=tar.gz ] require sourceforge [ project=peerguardian suffix=tar.gz ]
@ -38,7 +39,7 @@ DEPENDENCIES="
app-arch/p7zip [[ description = [ needed for blocklists packed as .7z ] ]] app-arch/p7zip [[ description = [ needed for blocklists packed as .7z ] ]]
net-apps/NetworkManager [[ description = [ pglinux provides a net-apps/NetworkManager [[ description = [ pglinux provides a
networkmanager script ] ]] networkmanager script ] ]]
virtual/cron virtual/cron [[ description = [ to send daily reports ] ]]
virtual/mta [[ description = [ needed to send informational (blocklist virtual/mta [[ description = [ needed to send informational (blocklist
updates) and warning mails (if pglcmd.wd updates) and warning mails (if pglcmd.wd
detects a problem.) ] ]] detects a problem.) ] ]]

View File

@ -37,15 +37,9 @@ DEFAULT_SRC_PREPARE_PATCHES=(
-p2 "${FILES}"/0002-Respect-system-LDFLAGS.patch -p2 "${FILES}"/0002-Respect-system-LDFLAGS.patch
) )
DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
README.md
)
src_compile() { src_compile() {
local STEAM_CRYPT_BACKEND= local STEAM_CRYPT_BACKEND=
export CC=${CC} PKG_CONFIG=${PKG_CONFIG}
if option providers:nss ; then if option providers:nss ; then
STEAM_CRYPT_BACKEND=nss STEAM_CRYPT_BACKEND=nss
elif option providers:gcrypt ; then elif option providers:gcrypt ; then

View File

@ -46,7 +46,8 @@ DEPENDENCIES="
media/mpv media/mpv
media/smplayer media/smplayer
media/vlc media/vlc
) [[ *description = [ video player backend ] ]] ) [[ *description = [ video player backend, you probably want
at least one ] ]]
" "

View File

@ -31,8 +31,8 @@ src_configure() {
--with-gmp="/usr" \ --with-gmp="/usr" \
--with-mpfr="/usr" \ --with-mpfr="/usr" \
--disable-static \ --disable-static \
CC=${CC} \ CC="${CC}" \
CXX=${CXX} \ CXX="${CXX}" \
AR=${AR} AR="${AR}"
} }

View File

@ -22,7 +22,6 @@ DEFAULT_SRC_INSTALL_PARAMS=(
) )
src_prepare() { src_prepare() {
export CC=$(exhost --tool-prefix)cc
append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
} }

View File

@ -45,7 +45,7 @@ DEPENDENCIES="
" "
DEFAULT_SRC_COMPILE_PARAMS=( DEFAULT_SRC_COMPILE_PARAMS=(
LIBNAME=${LIBDIR} LIBNAME=lib
LIBEXECDIR=/usr/$(exhost --target)/libexec/rc LIBEXECDIR=/usr/$(exhost --target)/libexec/rc
OS=Linux OS=Linux
) )
@ -85,12 +85,12 @@ src_compile() {
MAKE_ARGS=" MAKE_ARGS="
${DEFAULT_SRC_COMPILE_PARAMS[@]} ${DEFAULT_SRC_COMPILE_PARAMS[@]}
MKNET=$(option newnet) MKNET=$(option newnet yes no)
MKSELINUX=no MKSELINUX=no
MKAUDIT=no MKAUDIT=no
MKPAM=$(optionv pam) MKPAM=$(optionv pam)
MKSTATICLIBS=no MKSTATICLIBS=no
MKTOOLS=$(option tools) MKTOOLS=$(option tools yes no)
" "
emake ${MAKE_ARGS} emake ${MAKE_ARGS}

View File

@ -25,7 +25,7 @@ DEPENDENCIES="
dev-python/python-cjson[python_abis:*(-)?] dev-python/python-cjson[python_abis:*(-)?]
dev-python/python-dateutil[python_abis:*(-)?] dev-python/python-dateutil[python_abis:*(-)?]
dev-python/python-eventlib[python_abis:*(-)?] dev-python/python-eventlib[python_abis:*(-)?]
dev-python/python-sipsimple[python_abis:*(-)?][>=3.0.0] dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
dev-python/zopeinterface[python_abis:*(-)?] dev-python/zopeinterface[python_abis:*(-)?]
net-twisted/TwistedCore[python_abis:*(-)?] net-twisted/TwistedCore[python_abis:*(-)?]
" "