diff --git a/metadata/about.conf b/metadata/about.conf index 3f25dee..9c55f7f 100644 --- a/metadata/about.conf +++ b/metadata/about.conf @@ -1,4 +1,4 @@ -summary=local -homepage=nohomepage +summary=DenKn: exhereses +homepage=https://github.com/DenisKnauf/exherbo-denkn owner=Denis Knauf status=third-party diff --git a/metadata/categories.conf b/metadata/categories.conf index d0372cb..52fa7de 100644 --- a/metadata/categories.conf +++ b/metadata/categories.conf @@ -1,5 +1,5 @@ app-arch +app-paludis +dev-lang net-proxy sys-fs -dev-lang -app-paludis diff --git a/packages/app-arch/pax/pax-20120606-r2.exheres-0 b/packages/app-arch/pax/pax-20120606-r2.exheres-0 index b07ebba..b631fbb 100644 --- a/packages/app-arch/pax/pax-20120606-r2.exheres-0 +++ b/packages/app-arch/pax/pax-20120606-r2.exheres-0 @@ -12,14 +12,15 @@ PLATFORMS="~amd64 ~x86" DEPENDENCIES="" src_compile() { - # Makefile says: - # # -DLONG_OFF_T The base type of off_t is a long, not a long long. - # # This is often defined in: /usr/include/sys/types.h - edo gcc -DLONG_OFF_T ${CFLAGS} ${LDFLAGS} -o pax *.c + # Makefile says: + # # -DLONG_OFF_T The base type of off_t is a long, not a long long. + # # This is often defined in: /usr/include/sys/types.h + edo $CC -DLONG_OFF_T ${CFLAGS} ${LDFLAGS} -o pax *.c } src_install() { - dobin pax - doman pax.1 - emagicdocs + dobin pax + doman pax.1 + emagicdocs } + diff --git a/packages/app-paludis/truckle/truckle-scm.exheres-0 b/packages/app-paludis/truckle/truckle-scm.exheres-0 index 31757bc..748afc0 100644 --- a/packages/app-paludis/truckle/truckle-scm.exheres-0 +++ b/packages/app-paludis/truckle/truckle-scm.exheres-0 @@ -8,15 +8,16 @@ SUMMARY="truckle - smart console cave wrapper" LICENCES="GPL-2" SLOT="0" -PLATFORMS="~amd64" +PLATFORMS="~amd64 ~x86" MYOPTIONS="" DEPENDENCIES=" run: + dev-lang/ruby:*[>=1.9] sys-apps/paludis - dev-lang/ruby[>=1.9] " src_install() { - emake install PREFIX=/usr D=$IMAGE + emake install PREFIX=/usr D="${IMAGE}" } + diff --git a/packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 b/packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 index 81134eb..3cdd0b4 100644 --- a/packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 +++ b/packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 @@ -1,24 +1,25 @@ # Copyright (c) 2012 Denis Knauf # Distributed under the terms of the GNU General Public License v2 -AN="pl-${PV}" +AN=pl-${PV} SUMMARY="SWI-Prolog offers a comprehensive Free Software Prolog environment" HOMEPAGE="http://www.swi-prolog.org/" DOWNLOADS="http://www.swi-prolog.org/download/stable/src/${AN}.tar.gz" SLOT="0" LICENCES="GPL-2 LGPL-2" -PLATFORMS="~x86 ~amd64" +PLATFORMS="~amd64 ~x86" DEPENDENCIES="" MYOPTIONS="" -WORK="${WORKBASE}/${AN}" +WORK=${WORKBASE}/${AN} src_configure() { - econf --libdir="${LIBDIR}" + econf --libdir="/usr/${LIBDIR}" } src_install() { - keepdir /usr/lib/swipl-${PV}/library/dialect/ifprolog - default + keepdir /usr/${LIBDIR}/swipl-${PV}/library/dialect/ifprolog + default } + diff --git a/packages/net-proxy/tinyproxy/files/systemd.patch b/packages/net-proxy/tinyproxy/files/systemd.patch new file mode 100644 index 0000000..1366d83 --- /dev/null +++ b/packages/net-proxy/tinyproxy/files/systemd.patch @@ -0,0 +1,15 @@ +Systemd wants all pidfiles in /run. This patch will patch the config-file, +so systemd gets his pid-file at the right place. +--- a/etc/tinyproxy.conf.in 2010-03-03 10:37:24.000000000 +0100 ++++ b/etc/tinyproxy.conf.in 2013-03-09 15:34:41.072135782 +0100 +@@ -123,7 +123,11 @@ + # can be used for signalling purposes. + # + #PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid" ++# ++# systemd wants all pidfiles in /run. ++# Do not change the following line: ++PidFile "/run/tinyproxy/tinyproxy.pid" + + # + # XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which diff --git a/packages/net-proxy/tinyproxy/files/user.patch b/packages/net-proxy/tinyproxy/files/user.patch new file mode 100644 index 0000000..b0568a4 --- /dev/null +++ b/packages/net-proxy/tinyproxy/files/user.patch @@ -0,0 +1,14 @@ +tinyproxy will run as user tinyproxy, not nobody. +--- a/etc/tinyproxy.conf.in 2010-03-03 10:37:24.000000000 +0100 ++++ b/etc/tinyproxy.conf.in 2013-03-09 15:34:41.072135782 +0100 +@@ -12,8 +12,8 @@ + # as the root user. Either the user or group name or the UID or GID + # number may be used. + # +-User nobody +-Group nobody ++User tinyproxy ++Group tinyproxy + + # + # Port: Specify the port which tinyproxy will listen on. Please note diff --git a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 index 0216770..8f5e7ae 100644 --- a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 +++ b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 @@ -10,9 +10,9 @@ SLOT="0" LICENCES="GPL-2" PLATFORMS="~amd64 ~x86" DEPENDENCIES=" - group/tinyproxy - user/tinyproxy - app-doc/asciidoc + app-doc/asciidoc + group/tinyproxy + user/tinyproxy " # PID-file will be created in /var/run, but /var/run is a link to /run. # in future, tinyproxy needs an other config, that it uses /run. @@ -21,33 +21,20 @@ DEFAULT_SRC_CONFIGURE_PARAMS="--localstatedir=/var" MYOPTIONS="systemd" src_prepare() { - c="etc/tinyproxy.conf.in" - b="${c}.bk" - if option systemd - then - sed -e 's,^#PidFile.*,&\ -#\ -# systemd wants all pidfiles in /run.\ -# Do not change the following line:\ -PidFile "/run/tinyproxy/tinyproxy.pid",' - else - cat - fi < "${c}" > "${b}" - sed \ - -e 's/^User nobody/User tinyproxy/' \ - -e 's/^Group nobody/Group tinyproxy/' \ - < "${b}" > "${c}" + option systemd && expatch "${FILES}/systemd.patch" + expatch "${FILES}/user.patch" } src_install() { - default - keepdir /var/log/tinyproxy - if option systemd - then - install_systemd_files - insinto /usr/${LIBDIR}/tmpfiles.d - hereins tinyproxy.conf <