From dc7d8335af0ac04f1995e6b4860fb2bc234bbc12 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Sat, 9 Mar 2013 14:47:29 +0100 Subject: [PATCH 1/6] some list sorted, var-quoting changed (ws), deps morelined --- metadata/about.conf | 2 +- metadata/categories.conf | 4 ++-- packages/app-paludis/truckle/truckle-scm.exheres-0 | 4 ++-- packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 | 6 +++--- packages/sys-fs/xfsdump/xfsdump-3.1.2.exheres-0 | 7 +++++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/metadata/about.conf b/metadata/about.conf index 3f25dee..7c7810f 100644 --- a/metadata/about.conf +++ b/metadata/about.conf @@ -1,4 +1,4 @@ summary=local -homepage=nohomepage +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-paludis/truckle/truckle-scm.exheres-0 b/packages/app-paludis/truckle/truckle-scm.exheres-0 index 31757bc..ae561fb 100644 --- a/packages/app-paludis/truckle/truckle-scm.exheres-0 +++ b/packages/app-paludis/truckle/truckle-scm.exheres-0 @@ -8,7 +8,7 @@ SUMMARY="truckle - smart console cave wrapper" LICENCES="GPL-2" SLOT="0" -PLATFORMS="~amd64" +PLATFORMS="~amd64 ~x86" MYOPTIONS="" DEPENDENCIES=" @@ -18,5 +18,5 @@ DEPENDENCIES=" " 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 81d11ab..5189c35 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,18 +1,18 @@ # 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() { env diff --git a/packages/sys-fs/xfsdump/xfsdump-3.1.2.exheres-0 b/packages/sys-fs/xfsdump/xfsdump-3.1.2.exheres-0 index bc1f10d..a0a0463 100644 --- a/packages/sys-fs/xfsdump/xfsdump-3.1.2.exheres-0 +++ b/packages/sys-fs/xfsdump/xfsdump-3.1.2.exheres-0 @@ -6,7 +6,10 @@ HOMEPAGE="http://oss.sgi.com/projects/xfs" DOWNLOADS="ftp://oss.sgi.com/projects/xfs/cmd_tars/${PNV}.tar.gz" SLOT="0" LICENCES="GPL-2" -PLATFORMS="~x86 ~amd64" +PLATFORMS="~amd64 ~x86" MYOPTIONS="" -DEPENDENCIES="build+run: sys-fs/xfsprogs" +DEPENDENCIES=" + build+run: + sys-fs/xfsprogs +" DEFAULT_SRC_INSTALL_PARAMS+=( DIST_ROOT="${IMAGE}" ) From eb02dc03702f9f98f3ff824759a9de5c86264905 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Sat, 9 Mar 2013 14:57:53 +0100 Subject: [PATCH 2/6] swi-prolog: absolute libdir-path --- packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5189c35..67f7d03 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 @@ -16,10 +16,10 @@ WORK=${WORKBASE}/${AN} src_configure() { env - econf --libdir="${LIBDIR}" + econf --libdir="/usr/${LIBDIR}" } src_install() { - keepdir /usr/lib/swipl-${PV}/library/dialect/ifprolog + keepdir /usr/${LIBDIR}/swipl-${PV}/library/dialect/ifprolog default } From ff1e779c209a3c28053587c0375c8e8b32343fbd Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Sat, 9 Mar 2013 15:32:00 +0100 Subject: [PATCH 3/6] tabs->4spaces. deps-sorting. pax: gcc->$CC --- metadata/about.conf | 2 +- .../app-arch/pax/pax-20120606-r2.exheres-0 | 14 +++--- .../app-paludis/truckle/truckle-scm.exheres-0 | 2 +- .../swi-prolog/swi-prolog-6.2.6.exheres-0 | 8 ++-- .../tinyproxy/tinyproxy-1.8.3.exheres-0 | 46 +++++++++---------- .../sys-fs/xfsdump/xfsdump-3.1.2.exheres-0 | 5 +- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/metadata/about.conf b/metadata/about.conf index 7c7810f..9c55f7f 100644 --- a/metadata/about.conf +++ b/metadata/about.conf @@ -1,4 +1,4 @@ -summary=local +summary=DenKn: exhereses homepage=https://github.com/DenisKnauf/exherbo-denkn owner=Denis Knauf status=third-party diff --git a/packages/app-arch/pax/pax-20120606-r2.exheres-0 b/packages/app-arch/pax/pax-20120606-r2.exheres-0 index b07ebba..e324fbd 100644 --- a/packages/app-arch/pax/pax-20120606-r2.exheres-0 +++ b/packages/app-arch/pax/pax-20120606-r2.exheres-0 @@ -12,14 +12,14 @@ 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 ae561fb..8732122 100644 --- a/packages/app-paludis/truckle/truckle-scm.exheres-0 +++ b/packages/app-paludis/truckle/truckle-scm.exheres-0 @@ -13,8 +13,8 @@ MYOPTIONS="" DEPENDENCIES=" run: - sys-apps/paludis dev-lang/ruby[>=1.9] + sys-apps/paludis " src_install() { 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 67f7d03..37575c2 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 @@ -15,11 +15,11 @@ MYOPTIONS="" WORK=${WORKBASE}/${AN} src_configure() { - env - econf --libdir="/usr/${LIBDIR}" + env + econf --libdir="/usr/${LIBDIR}" } src_install() { - keepdir /usr/${LIBDIR}/swipl-${PV}/library/dialect/ifprolog - default + keepdir /usr/${LIBDIR}/swipl-${PV}/library/dialect/ifprolog + default } 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..2e0a9f3 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,33 @@ 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.*,&\ + 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}" + else + cat + fi < "${c}" > "${b}" + sed \ + -e 's/^User nobody/User tinyproxy/' \ + -e 's/^Group nobody/Group tinyproxy/' \ + < "${b}" > "${c}" } src_install() { - default - keepdir /var/log/tinyproxy - if option systemd - then - install_systemd_files - insinto /usr/${LIBDIR}/tmpfiles.d - hereins tinyproxy.conf < Date: Sat, 9 Mar 2013 15:48:26 +0100 Subject: [PATCH 4/6] tinyproxy: patches for username and systemd (optional) --- packages/net-proxy/tinyproxy/files/systemd.patch | 13 +++++++++++++ packages/net-proxy/tinyproxy/files/user.patch | 13 +++++++++++++ .../tinyproxy/tinyproxy-1.8.3.exheres-0 | 16 ++-------------- 3 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 packages/net-proxy/tinyproxy/files/systemd.patch create mode 100644 packages/net-proxy/tinyproxy/files/user.patch diff --git a/packages/net-proxy/tinyproxy/files/systemd.patch b/packages/net-proxy/tinyproxy/files/systemd.patch new file mode 100644 index 0000000..6611d1b --- /dev/null +++ b/packages/net-proxy/tinyproxy/files/systemd.patch @@ -0,0 +1,13 @@ +--- 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..3a6eb34 --- /dev/null +++ b/packages/net-proxy/tinyproxy/files/user.patch @@ -0,0 +1,13 @@ +--- 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 2e0a9f3..1fd2fed 100644 --- a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 +++ b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 @@ -23,20 +23,8 @@ 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() { From 4f8862030d34e571a8196967dbf7f7e25928352c Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Sat, 9 Mar 2013 15:51:54 +0100 Subject: [PATCH 5/6] extra LN before eOF --- packages/app-arch/pax/pax-20120606-r2.exheres-0 | 1 + packages/app-paludis/truckle/truckle-scm.exheres-0 | 1 + packages/dev-lang/swi-prolog/swi-prolog-6.2.6.exheres-0 | 1 + packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 | 1 + 4 files changed, 4 insertions(+) diff --git a/packages/app-arch/pax/pax-20120606-r2.exheres-0 b/packages/app-arch/pax/pax-20120606-r2.exheres-0 index e324fbd..b631fbb 100644 --- a/packages/app-arch/pax/pax-20120606-r2.exheres-0 +++ b/packages/app-arch/pax/pax-20120606-r2.exheres-0 @@ -23,3 +23,4 @@ src_install() { 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 8732122..0427773 100644 --- a/packages/app-paludis/truckle/truckle-scm.exheres-0 +++ b/packages/app-paludis/truckle/truckle-scm.exheres-0 @@ -20,3 +20,4 @@ DEPENDENCIES=" src_install() { 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 37575c2..05a6792 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 @@ -23,3 +23,4 @@ src_install() { keepdir /usr/${LIBDIR}/swipl-${PV}/library/dialect/ifprolog default } + 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 1fd2fed..88c7398 100644 --- a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 +++ b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 @@ -39,3 +39,4 @@ d /run/tinyproxy 0770 tinyproxy tinyproxy EOF fi } + From 49f9e461e01af93743b429a517a4ac7e893f6a7a Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Sat, 9 Mar 2013 15:54:48 +0100 Subject: [PATCH 6/6] """ --- packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 88c7398..68a769f 100644 --- a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 +++ b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 @@ -24,7 +24,7 @@ src_prepare() { c="etc/tinyproxy.conf.in" b="${c}.bk" option systemd && expatch "${FILES}/systemd.patch" - expatch "${FILES}/user.patch + expatch "${FILES}/user.patch" } src_install() {