Merge updates from master

This commit is contained in:
Repository QA checks
2015-08-28 09:27:32 -04:00
13 changed files with 338 additions and 5 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
EAPI=5
inherit eutils base toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
PATCHES=( ${FILESDIR}/${PN}-1.2.2-Makefile.patch )
+1
View File
@@ -0,0 +1 @@
DIST hstr-1.17.tar.gz 37289 SHA256 9e4b6e74bb7852945e25727105c5339c49c9ce1218481845c8d0205514d85e70 SHA512 eb89496c8554eb29ebb30430aa01179f7265a8ec15b0b9452f7e3ac4867ae4349e6141e11f0af01a4d15ba06131c18ec9ab760c8e68100fa2b8f2a793b237f9b WHIRLPOOL 2b33f485525b2cb033a82b249976d7c670d8f02948e84e73f350b19bdc955e551014f14ad4cfc845144ff0e0d8c3690c50b4444a414c7909f0106242d13a9cc2
@@ -0,0 +1,47 @@
diff --git a/configure.ac b/configure.ac
index 9cf6a53..cbc649d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,17 +18,21 @@ AC_PROG_CC
# Platform specific ncurses check.
AC_CANONICAL_HOST
-AS_CASE([$host_os],
- [darwin*],
- [
- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
- AC_CHECK_HEADER(curses.h)
- ],
- [
- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
- AC_CHECK_HEADER(ncursesw/curses.h)
- ]
-)
+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
+ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
+ AS_CASE([$host_os],
+ [darwin*],
+ [
+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+ AC_CHECK_HEADER(curses.h)
+ ],
+ [
+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+ AC_CHECK_HEADER(ncursesw/curses.h)
+ ]
+ )
+ ])
+])
# Checks for libraries.
AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
diff --git a/src/Makefile.am b/src/Makefile.am
index 5765613..ee411a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,3 +15,5 @@ hh_SOURCES = \
hstr_regexp.c include/hstr_regexp.h \
radixsort.c include/radixsort.h \
hstr.c
+
+hh_LDADD = $(NCURSES_LIBS)
+34
View File
@@ -0,0 +1,34 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=true
inherit autotools-utils
DESCRIPTION="Shell history suggest box - easily view, navigate, search and manage your command history"
HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
SRC_URI="https://github.com/dvorka/hstr/archive/1.17.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="sys-libs/ncurses:0="
DEPEND="${RDEPEND}
virtual/pkgconfig
"
PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
DOCS=( CONFIGURATION.md README.md )
src_prepare() {
sed \
-e 's:-O2::g' \
-i src/Makefile.am || die
autotools-utils_src_prepare
}
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>shell-tools</herd>
<maintainer>
<email>jlec@gentoo.org</email>
<name>Justin Lecher</name>
</maintainer>
<maintainer>
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
</maintainer>
</pkgmetadata>
+1
View File
@@ -1,2 +1,3 @@
DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
DIST cups-filters-1.0.73.tar.xz 1351652 SHA256 84521dc5079e683144e95e22ffcdbc3d51c44f9d4079c5bcc7f7ff421e94ec75 SHA512 ae380403569640fab21c9a0914b894628bcc57b709d68c05b620ec425734436281fe752d99b83c114927110489e523ffdb676b723109094dc7ef6d53bc9e8f41 WHIRLPOOL 3c447ed182a73cab84349101f5846c0cf9784de0b50960bc689de3f4086becf392229d378cc5fa70857adc66191f67e564ed5b6f2c081a7184e62b788d1f80f9
DIST cups-filters-1.0.74.tar.xz 1352328 SHA256 55e86080c3778d247d88bf6232947cb7c2057a6bce501c6e707800846f71119b SHA512 b7eac4915ee95524af37342bd3dcb4a430052f32360654df5c2cab9373c1c1993d51f5066b44936f5a0ed43b4f34ff22db54f65de1eff4361469577621496954 WHIRLPOOL 07da3a30af49b6ae73d308260b73ef4a67989fab9a2546bd40c75a921c51e058b2e7cab418d8e8e51def1dc414ba6d9c7924cddd1652b59fb160d07806b0454d
@@ -0,0 +1,120 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
GENTOO_DEPEND_ON_PERL=no
inherit base eutils perl-module autotools systemd
if [[ "${PV}" == "9999" ]] ; then
inherit bzr
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
KEYWORDS=""
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
fi
DESCRIPTION="Cups PDF filters"
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
LICENSE="MIT GPL-2"
SLOT="0"
IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
RDEPEND="
>=app-text/ghostscript-gpl-9.09
app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
>=app-text/qpdf-3.0.2:=
media-libs/fontconfig
media-libs/freetype:2
media-libs/lcms:2
>=net-print/cups-1.7.3
!<=net-print/cups-1.5.9999
sys-devel/bc
sys-libs/zlib
dbus? ( sys-apps/dbus )
foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
perl? ( dev-lang/perl:= )
png? ( media-libs/libpng:0= )
tiff? ( media-libs/tiff:0 )
zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${RDEPEND}"
src_prepare() {
base_src_prepare
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
eautoreconf
}
src_configure() {
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
$(use_enable dbus) \
$(use_enable zeroconf avahi) \
$(use_enable static-libs static) \
--with-fontdir="fonts/conf.avail" \
--with-pdftops=pdftops \
--enable-imagefilters \
$(use_with jpeg) \
$(use_with png) \
$(use_with tiff) \
--with-rcdir=no \
--with-browseremoteprotocols=DNSSD,CUPS \
--without-php
}
src_compile() {
MAKEOPTS=-j1 default
if use perl; then
pushd "${S}/scripting/perl" > /dev/null
perl-module_src_configure
perl-module_src_compile
popd > /dev/null
fi
}
src_install() {
default
if use perl; then
pushd "${S}/scripting/perl" > /dev/null
perl-module_src_install
perl_delete_localpod
popd > /dev/null
fi
# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
prune_libtool_files --all
cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
if ! use zeroconf ; then
sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
fi
if ! use foomatic ; then
# this needs an upstream solution / configure switch
rm -v "${ED}/usr/bin/foomatic-rip" || die
rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
fi
doinitd "${T}"/cups-browsed
systemd_dounit "${S}/utils/cups-browsed.service"
}
pkg_postinst() {
if ! use foomatic ; then
ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
fi
}
+2 -1
View File
@@ -1 +1,2 @@
DIST wmSun-1.03.tar.gz 49744 RMD160 9c3bb5e35107d5ed74d0da329495beb7b0cfbff9 SHA1 e9933d84db322631f331c432ee15d4fe4decd707 SHA256 a46e11680d4625589d4d91030e17916c02405451e60d366340668a01597c4ea2
DIST wmSun-1.03.tar.gz 49744 SHA256 a46e11680d4625589d4d91030e17916c02405451e60d366340668a01597c4ea2
DIST wmsun-1.05.tar.gz 20680 SHA256 c70429aa8c201f3135bcea1c6ab441d3441bda399d8766824b9e506e9c85db69 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da WHIRLPOOL 2002a90c39369fec6a5567e32c4445d50f9fc5b5b07b70a2de6bb7f720ea68480249587346a519316dc96925b794273d9662f72815d7ab04cc8e748e5bc3244c
+35
View File
@@ -0,0 +1,35 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs
MY_P=${P/S/s}
DESCRIPTION="dockapp which displays the rise/set time of the sun"
HOMEPAGE="http://windowmaker.org/dockapps/?name=wmsun"
# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
IUSE=""
RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
x11-proto/xproto"
S="${WORKDIR}/${MY_P}"
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
emake DESTDIR="${D}" PREFIX=/usr install
dodoc README {BUGS,TODO}
}
+1
View File
@@ -1,4 +1,5 @@
DIST wmifs-1.3b1.tar.gz 32970 SHA256 771bf1f99ec3ef7d95a06b8cb37059876cf054fec593536794ab9f13facf011d
DIST wmifs-1.4.tar.gz 28654 SHA256 6f13c030d5e5717eb73778928c3eb527ddda86fccece3a09506940ff333b9bea SHA512 09c444ca26783ba84b1679c311c3d72bc12e5699c4a368b6dd4ef41e248ff9a1c7ffc7c4353cfe9aa6728fcbc7c2573acc64e8df2060a7196c0b0454683c283e WHIRLPOOL 4ceca1557a74846f27d49fb5e05ed73029622e545eba66144b02eb3715fc55320a7c485ece9022188dbceaf9875b6391a1a754315b59611ee9589f5fd7fc562c
DIST wmifs-1.5.tar.gz 32164 SHA256 cf1a722e8b7881d0d8bda7850606c503db1e936ec5196b0c402f750a66e5fec9 SHA512 35c466a641324ae4f6ad1fc2f7954328ade39964953e83074bdffdd3e36414ff2e66bfaf2ee8668e18937f3ee371d328d91adadd0f3859c2eb68e68a38f184b0 WHIRLPOOL acffc1d6c17aa5602b5c61690dafc9131acd93ea9c5211867c39f37a93d7faab4bc93ce2a2d9f41c6778fb60958e8e2567c5602e97f7e32c3479a30b2197b6b5
DIST wmifs-1.6.tar.gz 25980 SHA256 d29ea295830c5399592fda281c492739c3b9229019d04ae211c540fb1cb0274a SHA512 d16a087a7fa1a1354127aa69db9e197ba14254c44366a9e1deb69cc00bef301922939afbade10b2b2827243ca00627cc53b941ef5f8e129d2a6637a19c02250f WHIRLPOOL 18d29f4cb49b09b4969875841324c75dbbbd91bde0d1ce7215a77411783a51d29393230462606323f3eb9843bfa87523e3c94548e124be2a085ec9a2a5bb8feb
DIST wmifs_1.3b1-11.diff.gz 8117 SHA256 3bd6d6d9021903708692560a403d4aee0cfaa912b5c467a0145b5fc8a6ff5cc0
+37
View File
@@ -0,0 +1,37 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit toolchain-funcs
DESCRIPTION="Network monitoring dockapp"
HOMEPAGE="http://windowmaker.org/dockapps/?name=wmtime"
# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
IUSE=""
RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
x11-proto/xextproto"
src_prepare() {
# Honour Gentoo LDFLAGS, see bug #336537
sed -i "s/-o wmifs/\$(LDFLAGS) -o wmifs/" Makefile || die "sed failed"
}
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
emake DESTDIR="${D}" prefix=/usr install
dodoc BUGS CHANGES HINTS README TODO
}
+2 -1
View File
@@ -1 +1,2 @@
DIST wmppp-1.3.0.tar.gz 31187 RMD160 2f560637292626561e58a3218e10f17d6e18ab11 SHA1 981b60805f8fd208a055ceb451152ba9d6b6ade9 SHA256 ce9aba279d4e88e34d239e7f69ff7ad000626b9c4210f5bb9c46a4ec318e8c4f
DIST wmppp-1.3.0.tar.gz 31187 SHA256 ce9aba279d4e88e34d239e7f69ff7ad000626b9c4210f5bb9c46a4ec318e8c4f
DIST wmppp.app-1.3.2.tar.gz 26861 SHA256 677b109c72ec0a69c950dfd8da3674daf002e9c0cc6982c45af6c81a0bc38865 SHA512 92e9d8c3dea92907bcde0b7da9f599f2fe6354cb8c4f60969ac5d3e69a6ea0c8547388b6228f35a2e4bc2d5888ba89354aa18950e705cbd444798467255ea8fc WHIRLPOOL 0f408b2b1b10ae517a418331a48030207121dfce8a82d9b4b6cf49928257245cf282fb1af51adb927e610373743ea51a49189b3f07833c70413d26896a4684b6
+42
View File
@@ -0,0 +1,42 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit toolchain-funcs
MY_P=${PN}.app-${PV}
DESCRIPTION="PPP dial control and network load monitor with NeXTStep look"
HOMEPAGE="http://windowmaker.org/dockapps/?name=wmppp.app"
# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
DEPEND="${RDEPEND}
x11-proto/xextproto"
S=${WORKDIR}/${MY_P}
#src_prepare() {
# sed -ie 's/-o wmppp/\$(LDFLAGS) -o wmppp/' Makefile
#}
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install () {
emake DESTDIR="${D}" PREFIX=/usr install
# dobin wmppp
# exeinto /etc/ppp
# doexe getmodemspeed
# dodoc user.wmppprc
dodoc BUGS CHANGES HINTS README TODO
}