diff options
45 files changed, 502 insertions, 628 deletions
diff --git a/app-misc/ondir/ondir-0.2.2-r1.ebuild b/app-misc/ondir/ondir-0.2.2-r1.ebuild deleted file mode 100644 index 58c113acfb4b..000000000000 --- a/app-misc/ondir/ondir-0.2.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="3" - -inherit toolchain-funcs - -DESCRIPTION="Automatically execute scripts as you traverse directories" -HOMEPAGE="http://swapoff.org/OnDir" -SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" - -DEPEND="sys-apps/sed" -RDEPEND="" - -src_prepare() { - sed -i \ - -e "s:\(/man/.*$\):/share\1:g" \ - -e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed" -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - PREFIX="${EPREFIX}/usr" \ - CONF="${EPREFIX}/etc/ondirrc" \ - LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" CONF="${EPREFIX}/etc/ondirrc" install || die - dodoc AUTHORS ChangeLog README INSTALL scripts.tcsh scripts.sh || die - newdoc ondirrc.eg ondirrc.example || die - dohtml changelog.html ondir.1.html || die -} diff --git a/app-misc/splitvt/splitvt-1.6.6-r2.ebuild b/app-misc/splitvt/splitvt-1.6.6-r2.ebuild deleted file mode 100644 index a007ffa4eeab..000000000000 --- a/app-misc/splitvt/splitvt-1.6.6-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="3" - -inherit eutils toolchain-funcs - -MY_P="${P/-/_}" -DEB_PL="7" - -DESCRIPTION="Splitting terminals into two shells" -HOMEPAGE="http://www.devolution.com/~slouken/projects/splitvt" -SRC_URI=" - http://www.devolution.com/~slouken/projects/${PN}/${P}.tar.gz - mirror://debian/pool/main/s/splitvt/${MY_P}-${DEB_PL}.diff.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ia64 ppc sparc x86" -IUSE="" - -DEPEND=">=sys-libs/ncurses-5.2" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${WORKDIR}"/${MY_P}-${DEB_PL}.diff \ - "${FILESDIR}"/${PV}-ldflags.patch - sed -i \ - -e "s:/usr/local/bin:${D}/usr/bin:g" \ - -e "s:/usr/local/man/:${D}/usr/share/man/:g" config.c || die -} - -src_configure() { - # upstream has their own weirdo configure script... - ./configure || die "configure failed" - sed -i -e "s:-O2:${CFLAGS}:" -e "s:^CC = gcc:CC = $(tc-getCC):" Makefile || die -} - -src_install() { - dodir /usr/bin /usr/share/man/man1/ || die - make install || die "make install failed" - fperms 755 /usr/bin/xsplitvt || die - dodoc ANNOUNCE BLURB CHANGES NOTES README TODO || die - doman splitvt.1 || die -} diff --git a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild index 6fe1ef463d0a..e28504982b78 100644 --- a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild +++ b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ia64 ppc sparc x86" DEPEND="sys-libs/ncurses:0=" RDEPEND="${DEPEND}" diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild index 66f5a9007525..3010af4f0e28 100644 --- a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild +++ b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -86,8 +86,7 @@ python_test() { } python_compile_all() { - cd docs || die - emake man $(usex doc html "") + emake -C docs -j1 man $(usex doc html "") } python_install_all() { diff --git a/gnustep-apps/preview/preview-0.9.ebuild b/gnustep-apps/preview/preview-0.9.ebuild index 1f5d11774224..f7bac95e785d 100644 --- a/gnustep-apps/preview/preview-0.9.ebuild +++ b/gnustep-apps/preview/preview-0.9.ebuild @@ -1,21 +1,27 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit gnustep-2 +EAPI=6 -S=${WORKDIR}/${PN/p/P} +inherit gnustep-2 DESCRIPTION="Simple image viewer" HOMEPAGE="http://www.sonappart.net/softwares/preview/" SRC_URI="http://www.sonappart.net/softwares/preview/download/${P/p/P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="" -src_prepare() { - sed -e 's/sel_eq(/sel_isEqual(/' -i Document.m || die "sed failed" +S=${WORKDIR}/${PN/p/P} + +PATCHES=( # Fix compilation, patch from debian - epatch "${FILESDIR}"/${PN}-0.8.5-compilation-errors.patch + "${FILESDIR}"/${PN}-0.8.5-compilation-errors.patch +) + +src_prepare() { + default + sed -e 's/sel_eq(/sel_isEqual(/' -i Document.m || die } diff --git a/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild b/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild index 3173869bf4a9..4deadee636c5 100644 --- a/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild +++ b/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 + inherit gnustep-2 DESCRIPTION="GNUstep LDAP library for open ldap C libraries" HOMEPAGE="http://www.gnustep.org/" SRC_URI="mirror://gentoo/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" LICENSE="LGPL-2.1" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="net-nds/openldap" RDEPEND="${DEPEND}" src_prepare() { + default sed -i -e "s|#include <GNUstepBase/GSCategories.h>||" \ GSLDAPCom.h || die "GSCategories.h sed failed" } diff --git a/media-gfx/replicatorg/replicatorg-37-r2.ebuild b/media-gfx/replicatorg/replicatorg-37-r2.ebuild index fbb7b8981eab..d2ec0905f939 100644 --- a/media-gfx/replicatorg/replicatorg-37-r2.ebuild +++ b/media-gfx/replicatorg/replicatorg-37-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 -inherit eutils versionator user +inherit versionator user MY_P="${PN}-00${PV}" @@ -11,45 +11,30 @@ DESCRIPTION="ReplicatorG is a simple, open source 3D printing program" HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG" SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~x86" - IUSE="" -COMMON_DEPEND="dev-java/oracle-jre-bin" +COMMON_DEPEND="dev-java/oracle-jre-bin:*" RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND}" S="${WORKDIR}/${MY_P}" +QA_WX_LOAD=" + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so" +QA_TEXTRELS=" + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so + /opt/replicatorg/lib-i686/libj3dcore-ogl.so + /opt/replicatorg/lib-i686/libj3dcore-ogl-cg.so" + pkg_setup() { enewgroup replicator } -pkg_postinst() { - elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK." - elog - elog "Ensure that your user account has permissions to access serial port," - elog "if you plan to connect directly to a 3d printer rather than using" - elog "a flash card. Printing directly from replicatorg is preferred." - elog - elog "The replicator printer will likely show up in /dev as ttyACM0." - elog "You may want to autoload the cdc_acm kernel module." - elog - elog "Note that replicatorg includes its own version of skeinforge." - elog "There doesn't seem to be a simple way to depend on an external" - elog "version." - elog - elog "Replicatorg users should add themselves to the replicator group" - elog "to avoid upstream warnings about not being able to modify shared" - elog "skeinforge scripts." - elog - chmod -R g+w "${ROOT}"/opt/replicatorg - chown -R root:replicator "${ROOT}"/opt/replicatorg - chmod 0755 /opt/replicatorg -} - src_install() { dodir \ /opt/replicatorg \ @@ -61,7 +46,8 @@ src_install() { dobin "${FILESDIR}"/replicatorg - /bin/cp -R --preserve=mode \ + insinto /opt/replicatorg/ + doins -r \ docs \ examples \ lib \ @@ -71,8 +57,7 @@ src_install() { scripts \ replicatorg \ skein_engines \ - tools \ - "${D}"/opt/replicatorg/ + tools insinto /usr/share/replicatorg doins -r \ @@ -80,5 +65,28 @@ src_install() { license.txt \ readme.txt \ todo.txt +} +pkg_postinst() { + elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK." + elog + elog "Ensure that your user account has permissions to access serial port," + elog "if you plan to connect directly to a 3d printer rather than using" + elog "a flash card. Printing directly from replicatorg is preferred." + elog + elog "The replicator printer will likely show up in /dev as ttyACM0." + elog "You may want to autoload the cdc_acm kernel module." + elog + elog "Note that replicatorg includes its own version of skeinforge." + elog "There doesn't seem to be a simple way to depend on an external" + elog "version." + elog + elog "Replicatorg users should add themselves to the replicator group" + elog "to avoid upstream warnings about not being able to modify shared" + elog "skeinforge scripts." + elog + + chmod -R g+w "${EROOT%/}"/opt/replicatorg + chown -R root:replicator "${EROOT%/}"/opt/replicatorg + chmod 0755 /opt/replicatorg } diff --git a/media-gfx/replicatorg/replicatorg-40-r1.ebuild b/media-gfx/replicatorg/replicatorg-40-r1.ebuild index 2653c8696e89..217806f00c47 100644 --- a/media-gfx/replicatorg/replicatorg-40-r1.ebuild +++ b/media-gfx/replicatorg/replicatorg-40-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 -inherit eutils versionator user +inherit versionator user MY_P="${PN}-00${PV}" @@ -11,45 +11,30 @@ DESCRIPTION="ReplicatorG is a simple, open source 3D printing program" HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG" SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="" - IUSE="" -COMMON_DEPEND="dev-java/oracle-jre-bin" +COMMON_DEPEND="dev-java/oracle-jre-bin:*" RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND}" S="${WORKDIR}/${MY_P}" +QA_WX_LOAD=" + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so" +QA_TEXTRELS=" + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so + /opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so + /opt/replicatorg/lib-i686/libj3dcore-ogl.so + /opt/replicatorg/lib-i686/libj3dcore-ogl-cg.so" + pkg_setup() { enewgroup replicator } -pkg_postinst() { - elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK." - elog - elog "Ensure that your user account has permissions to access serial port," - elog "if you plan to connect directly to a 3d printer rather than using" - elog "a flash card. Printing directly from replicatorg is preferred." - elog - elog "The replicator printer will likely show up in /dev as ttyACM0." - elog "You may want to autoload the cdc_acm kernel module." - elog - elog "Note that replicatorg includes its own version of skeinforge." - elog "There doesn't seem to be a simple way to depend on an external" - elog "version." - elog - elog "Replicatorg users should add themselves to the replicator group" - elog "to avoid upstream warnings about not being able to modify shared" - elog "skeinforge scripts." - elog - chmod -R g+w "${ROOT}"/opt/replicatorg - chown -R root:replicator "${ROOT}"/opt/replicatorg - chmod 0755 /opt/replicatorg -} - src_install() { dodir \ /opt/replicatorg \ @@ -61,7 +46,8 @@ src_install() { dobin "${FILESDIR}"/replicatorg - /bin/cp -R --preserve=mode \ + insinto /opt/replicatorg/ + doins -r \ docs \ examples \ lib \ @@ -71,8 +57,7 @@ src_install() { scripts \ replicatorg \ skein_engines \ - tools \ - "${D}"/opt/replicatorg/ + tools insinto /usr/share/replicatorg doins -r \ @@ -80,5 +65,28 @@ src_install() { license.txt \ readme.txt \ todo.txt +} +pkg_postinst() { + elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK." + elog + elog "Ensure that your user account has permissions to access serial port," + elog "if you plan to connect directly to a 3d printer rather than using" + elog "a flash card. Printing directly from replicatorg is preferred." + elog + elog "The replicator printer will likely show up in /dev as ttyACM0." + elog "You may want to autoload the cdc_acm kernel module." + elog + elog "Note that replicatorg includes its own version of skeinforge." + elog "There doesn't seem to be a simple way to depend on an external" + elog "version." + elog + elog "Replicatorg users should add themselves to the replicator group" + elog "to avoid upstream warnings about not being able to modify shared" + elog "skeinforge scripts." + elog + + chmod -R g+w "${EROOT%/}"/opt/replicatorg + chown -R root:replicator "${EROOT%/}"/opt/replicatorg + chmod 0755 /opt/replicatorg } diff --git a/media-plugins/gmpc-discogs/gmpc-discogs-0.20.0.ebuild b/media-plugins/gmpc-discogs/gmpc-discogs-0.20.0.ebuild index 91c37e6e93fb..92daba83f203 100644 --- a/media-plugins/gmpc-discogs/gmpc-discogs-0.20.0.ebuild +++ b/media-plugins/gmpc-discogs/gmpc-discogs-0.20.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 DESCRIPTION="This plugin fetches artist and album images from discogs" HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_DISCOGS" @@ -12,13 +12,17 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -RDEPEND=">=media-sound/gmpc-${PV} - dev-libs/libxml2 - || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )" +RDEPEND=" + >=media-sound/gmpc-${PV} + dev-libs/libxml2:= + || ( + x11-libs/gdk-pixbuf:2[jpeg] + x11-libs/gtk+:2[jpeg] + )" DEPEND="${RDEPEND} virtual/pkgconfig" -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - find "${ED}" -name "*.la" -delete || die +src_install() { + default + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/gmpc-extraplaylist/gmpc-extraplaylist-0.20.0.ebuild b/media-plugins/gmpc-extraplaylist/gmpc-extraplaylist-0.20.0.ebuild index 399b44e39427..30eb2fccc6b4 100644 --- a/media-plugins/gmpc-extraplaylist/gmpc-extraplaylist-0.20.0.ebuild +++ b/media-plugins/gmpc-extraplaylist/gmpc-extraplaylist-0.20.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 DESCRIPTION="This plugin adds a second pane showing the playlist" HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_EXTRA_PLAYLIST" @@ -12,12 +12,13 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND=">=media-sound/gmpc-${PV} - dev-libs/libxml2" +RDEPEND=" + >=media-sound/gmpc-${PV} + dev-libs/libxml2:=" DEPEND="${RDEPEND} virtual/pkgconfig" -src_install () { - emake DESTDIR="${D}" install || die - find "${ED}" -name "*.la" -delete || die +src_install() { + default + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/gmpc-last-fm/gmpc-last-fm-0.20.0.ebuild b/media-plugins/gmpc-last-fm/gmpc-last-fm-0.20.0.ebuild index 8e16910403b7..f486656601fd 100644 --- a/media-plugins/gmpc-last-fm/gmpc-last-fm-0.20.0.ebuild +++ b/media-plugins/gmpc-last-fm/gmpc-last-fm-0.20.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 DESCRIPTION="This plugin fetches artist art from last.fm" HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LASTFM" @@ -12,13 +12,17 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND=">=media-sound/gmpc-${PV} - dev-libs/libxml2 - || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )" +RDEPEND=" + >=media-sound/gmpc-${PV} + dev-libs/libxml2:= + || ( + x11-libs/gdk-pixbuf:2[jpeg] + x11-libs/gtk+:2[jpeg] + )" DEPEND="${RDEPEND} virtual/pkgconfig" -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - find "${ED}" -name "*.la" -delete || die +src_install() { + default + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/gmpc-mdcover/gmpc-mdcover-0.20.0.ebuild b/media-plugins/gmpc-mdcover/gmpc-mdcover-0.20.0.ebuild index cd59cfee0f9c..148b866d37b1 100644 --- a/media-plugins/gmpc-mdcover/gmpc-mdcover-0.20.0.ebuild +++ b/media-plugins/gmpc-mdcover/gmpc-mdcover-0.20.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -DESCRIPTION="This plugin fetches cover art, artist art, album and artist information from the file system" +DESCRIPTION="Plugin for fetching cover art, artist art, album and artist information" HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MDCOVER" SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz" @@ -12,21 +12,25 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="nls" -RDEPEND=">=media-sound/gmpc-${PV} - dev-libs/libxml2 - || ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )" +RDEPEND=" + >=media-sound/gmpc-${PV} + dev-libs/libxml2:= + || ( + x11-libs/gdk-pixbuf:2[jpeg] + x11-libs/gtk+:2[jpeg] + )" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( dev-util/intltool - sys-devel/gettext )" + nls? ( + dev-util/intltool + sys-devel/gettext + )" src_configure() { - econf \ - $(use_enable nls) \ - --disable-dependency-tracking + econf $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install || die - find "${ED}" -name "*.la" -delete || die + default + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/gmpc-playlistsort/gmpc-playlistsort-0.20.0.ebuild b/media-plugins/gmpc-playlistsort/gmpc-playlistsort-0.20.0.ebuild index 9bc12016e411..ecf90faac632 100644 --- a/media-plugins/gmpc-playlistsort/gmpc-playlistsort-0.20.0.ebuild +++ b/media-plugins/gmpc-playlistsort/gmpc-playlistsort-0.20.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 DESCRIPTION="This plugin adds a dialog to sort the current playlist" HOMEPAGE="http://gmpc.wikia.com/" @@ -12,18 +12,14 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="" -RDEPEND=">=media-sound/gmpc-${PV} +RDEPEND=" + >=media-sound/gmpc-${PV} >=gnome-base/libglade-2 - dev-libs/libxml2" + dev-libs/libxml2:=" DEPEND="${RDEPEND} virtual/pkgconfig" -src_configure() { - econf \ - --disable-dependency-tracking -} - src_install() { - emake DESTDIR="${D}" install || die - find "${ED}" -name "*.la" -delete || die + default + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/gmpc-shout/gmpc-shout-0.20.0.ebuild b/media-plugins/gmpc-shout/gmpc-shout-0.20.0.ebuild index 1f1c70e1436e..d99728d90df6 100644 --- a/media-plugins/gmpc-shout/gmpc-shout-0.20.0.ebuild +++ b/media-plugins/gmpc-shout/gmpc-shout-0.20.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 DESCRIPTION="This plugin calls ogg123 and points it at mpd's shoutstream" HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_SHOUT" @@ -12,22 +12,23 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="nls" -RDEPEND=">=media-sound/gmpc-${PV} +RDEPEND=" + >=media-sound/gmpc-${PV} media-sound/vorbis-tools[ogg123] - dev-libs/libxml2 - x11-libs/cairo" + dev-libs/libxml2:= + x11-libs/cairo:=" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( dev-util/intltool - sys-devel/gettext )" + nls? ( + dev-util/intltool + sys-devel/gettext + )" src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable nls) + econf $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install || die - find "${ED}" -name "*.la" -delete || die + default + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild index e4c53408b9d7..7e64741327ae 100644 --- a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild +++ b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild @@ -1,57 +1,51 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then - SCM=git-2 - EGIT_BOOTSTRAP="" - EGIT_REPO_URI="git://git.videolan.org/${PN}.git" +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git" +else + KEYWORDS="amd64 ~ppc64 x86" + DEPEND="app-arch/xz-utils" + SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" fi -inherit autotools multilib ${SCM} - DESCRIPTION="Mozilla plugin based on VLC" HOMEPAGE="http://www.videolan.org/" LICENSE="LGPL-2.1" SLOT="0" - -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="amd64 ~ppc64 x86" - SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" - DEPEND="app-arch/xz-utils" -else - KEYWORDS="" - SRC_URI="" -fi IUSE="gtk" -RDEPEND=">=media-video/vlc-1.1 +RDEPEND=" + >=media-video/vlc-1.1 x11-libs/libX11 - !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) + !gtk? ( + x11-libs/libXpm + x11-libs/libSM + x11-libs/libICE + ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]" -DEPEND="${RDEPEND} - ${DEPEND} +DEPEND+=" + ${RDEPEND} virtual/pkgconfig >=net-misc/npapi-sdk-0.27" src_prepare() { - if [ "${PV%9999}" != "${PV}" ] ; then - eautoreconf - fi - cp "${FILESDIR}/xembed.h" "${S}/npapi/" || die + default + [[ ${PV} == *9999 ]] && eautoreconf } src_configure() { - econf \ - $(use_with gtk) + econf $(use_with gtk) } src_install() { - emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die - find "${D}" -name '*.la' -delete - dodoc NEWS AUTHORS ChangeLog || die + emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install + einstalldocs + + find "${D}" -name '*.la' -delete || die } diff --git a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild index 48a5b152ac91..b4e4e67c3dd1 100644 --- a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild +++ b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild @@ -1,56 +1,51 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then - SCM=git-2 - EGIT_BOOTSTRAP="" - EGIT_REPO_URI="git://git.videolan.org/${PN}.git" +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git" +else + KEYWORDS="~amd64 ~ppc64 ~x86" + DEPEND="app-arch/xz-utils" + SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" fi -inherit autotools multilib ${SCM} - DESCRIPTION="Mozilla plugin based on VLC" HOMEPAGE="http://www.videolan.org/" LICENSE="LGPL-2.1" SLOT="0" - -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64" - SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz" - DEPEND="app-arch/xz-utils" -else - KEYWORDS="" - SRC_URI="" -fi IUSE="gtk" -RDEPEND=">=media-video/vlc-1.1 +RDEPEND=" + >=media-video/vlc-1.1 x11-libs/libX11 - !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) + !gtk? ( + x11-libs/libXpm + x11-libs/libSM + x11-libs/libICE + ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]" -DEPEND="${RDEPEND} - ${DEPEND} +DEPEND+=" + ${RDEPEND} virtual/pkgconfig >=net-misc/npapi-sdk-0.27" src_prepare() { - if [ "${PV%9999}" != "${PV}" ] ; then - eautoreconf - fi + default + [[ ${PV} == *9999 ]] && eautoreconf } src_configure() { - econf \ - $(use_with gtk) + econf $(use_with gtk) } src_install() { - emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die - find "${D}" -name '*.la' -delete - dodoc NEWS AUTHORS ChangeLog || die + emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install + einstalldocs + + find "${D}" -name '*.la' -delete || die } diff --git a/net-libs/enet/enet-1.2.2-r1.ebuild b/net-libs/enet/enet-1.2.2-r1.ebuild index 574384dac15f..b38533678dda 100644 --- a/net-libs/enet/enet-1.2.2-r1.ebuild +++ b/net-libs/enet/enet-1.2.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP" HOMEPAGE="http://enet.bespin.org/" @@ -9,11 +9,9 @@ SRC_URI="http://enet.bespin.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="static-libs" src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) + econf $(use_enable static-libs static) } diff --git a/net-libs/enet/enet-1.2.2.ebuild b/net-libs/enet/enet-1.2.2.ebuild deleted file mode 100644 index 6d020d098e73..000000000000 --- a/net-libs/enet/enet-1.2.2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 -inherit base - -DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP" -HOMEPAGE="http://enet.bespin.org/" -SRC_URI="http://enet.bespin.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="static-libs" - -DOCS=( "ChangeLog" "README" ) - -src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) -} diff --git a/net-mail/safecat/files/safecat-1.13-head-tail-POSIX.patch b/net-mail/safecat/files/safecat-1.13-head-tail-POSIX.patch new file mode 100644 index 000000000000..59bd33b0f760 --- /dev/null +++ b/net-mail/safecat/files/safecat-1.13-head-tail-POSIX.patch @@ -0,0 +1,45 @@ +--- a/make-compile.sh ++++ b/make-compile.sh +@@ -1 +1 @@ +-echo exec "$CC" "`head -1 conf-includes`" -c '${1+"$@"}' ++echo exec "$CC" "`head -n 1 conf-includes`" -c '${1+"$@"}' +--- a/Makefile ++++ b/Makefile +@@ -17,8 +17,8 @@ + auto-ccld.sh: \ + conf-cc conf-ld warn-auto.sh + ( cat warn-auto.sh; \ +- echo CC=\'`head -1 conf-cc`\'; \ +- echo LD=\'`head -1 conf-ld`\'; \ ++ echo CC=\'`head -n 1 conf-cc`\'; \ ++ echo LD=\'`head -n 1 conf-ld`\'; \ + ) > auto-ccld.sh + + auto-str: \ +@@ -31,7 +31,7 @@ + + auto_home.c: \ + auto-str conf-root +- ./auto-str auto_home `head -1 conf-root` > auto_home.c ++ ./auto-str auto_home `head -n 1 conf-root` > auto_home.c + + auto_home.o: \ + compile auto_home.c +@@ -161,7 +161,7 @@ + maildir: \ + warn-auto.sh maildir.sh conf-root + cat warn-auto.sh maildir.sh \ +- | sed s}HOME}"`head -1 conf-root`"}g \ ++ | sed s}HOME}"`head -n 1 conf-root`"}g \ + > maildir + chmod 755 maildir + +@@ -407,7 +407,7 @@ + version.h: \ + conf-version + @echo 'static const char *const version_string="$$Version:' \ +- `head -1 conf-version` 'built' `date +"%b %d, %Y"` at \ ++ `head -n 1 conf-version` 'built' `date +"%b %d, %Y"` at \ + `date +"%H:%M"`'$$";' > version.h + + writefile.o: \ diff --git a/net-mail/safecat/safecat-1.13.ebuild b/net-mail/safecat/safecat-1.13.ebuild index 78dc3a099424..7dbf9cc60c48 100644 --- a/net-mail/safecat/safecat-1.13.ebuild +++ b/net-mail/safecat/safecat-1.13.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 -inherit fixheadtails eutils toolchain-funcs flag-o-matic +inherit toolchain-funcs -DESCRIPTION="Safecat implements qmail's maildir algorithm, copying standard input safely to a specified directory" +DESCRIPTION="Safecat implements qmail's maildir algorithm, safely copying standard input" HOMEPAGE="http://www.jeenyus.net/linux/software/safecat.html" SRC_URI="http://www.jeenyus.net/linux/software/${PN}/${P}.tar.gz" @@ -18,35 +18,32 @@ RESTRICT="test" DEPEND="sys-apps/groff" RDEPEND="" -src_prepare() { +PATCHES=( # applying maildir-patch - epatch "${FILESDIR}"/safecat-1.11-gentoo.patch - + "${FILESDIR}"/safecat-1.11-gentoo.patch # Fix parallel make errors - epatch "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-makefile.patch + # Fix POSIX head/tail syntax + "${FILESDIR}"/${P}-head-tail-POSIX.patch +) - ht_fix_file Makefile make-compile.sh +src_prepare() { + default - sed -ni '/man\|doc/!p' hier.c + sed -ni '/man\|doc/!p' hier.c || die # Fix implicit decleration - sed -i -e '/include <signal.h>/ a #include <stdlib.h>' \ - safecat.c + sed '/include <signal.h>/ a #include <stdlib.h>' -i safecat.c || die } src_configure() { - # safecat segfaults on gcc-4.0 x86 with -Os, seems to be okay with -O2 - if [[ $(gcc-major-version).$(gcc-minor-version) == 4.0 ]]; then - replace-flags -Os -O2 - fi - - echo "${D}/usr" > conf-root - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld + echo "${D}/usr" > conf-root || die + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die } src_install() { - emake setup check || die - dodoc CHANGES README + emake setup check + einstalldocs doman maildir.1 safecat.1 } diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4.ebuild index f007e274eaec..93faf978ed0a 100644 --- a/net-mail/vchkuser/vchkuser-0.4.ebuild +++ b/net-mail/vchkuser/vchkuser-0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 inherit autotools qmail @@ -14,13 +14,18 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="debug" -DEPEND="net-mail/vpopmail - || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] )" +DEPEND=" + net-mail/vpopmail + || ( + mail-mta/netqmail[qmail-spp] + mail-mta/qmail-ldap[qmail-spp] + )" RDEPEND="" S="${WORKDIR}/hollow-${PN}-8a048f7" src_prepare() { + default eautoreconf } @@ -29,12 +34,13 @@ src_configure() { $(use_enable debug) \ --with-vpopuser=vpopmail \ --with-qmailgroup=nofiles \ - --with-vpopmaildir=/var/vpopmail \ + --with-vpopmaildir="${EPREFIX}"/var/vpopmail \ --with-qmaildir=${QMAIL_HOME} } src_install() { - emake DESTDIR="${D}" install || die "emake failed" + default + fowners vpopmail:nofiles "${QMAIL_HOME}"/plugins/vchkuser fperms 4750 "${QMAIL_HOME}"/plugins/vchkuser } diff --git a/net-misc/arpd/arpd-0.2-r1.ebuild b/net-misc/arpd/arpd-0.2-r1.ebuild index 788d227dc629..bd8fb5f5f32d 100644 --- a/net-misc/arpd/arpd-0.2-r1.ebuild +++ b/net-misc/arpd/arpd-0.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 -inherit autotools eutils +inherit autotools -DESCRIPTION="ARP server which claims all unassigned addresses (for network monitoring or simulation)" +DESCRIPTION="ARP server claiming all unassigned addresses (for network monitoring/simulation)" HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/" SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz" @@ -14,28 +14,36 @@ SLOT="0" KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86" IUSE="" -DEPEND=">=dev-libs/libdnet-1.4 +DEPEND=" + >=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2" +RDEPEND="${DEPEND}" S=${WORKDIR}/${PN} -src_prepare() { - epatch "${FILESDIR}"/arpd.c.patch - epatch "${FILESDIR}"/${P}-libevent.patch +PATCHES=( + "${FILESDIR}"/arpd.c.patch + "${FILESDIR}"/${P}-libevent.patch - #fix bug 337481, replace test on libevent.a with libevent.so - epatch "${FILESDIR}"/${P}-buildsystem-libevent-test.patch + # bug 337481, replace test on libevent.a with libevent.so + "${FILESDIR}"/${P}-buildsystem-libevent-test.patch +) +src_prepare() { + default + mv configure.{in,ac} || die eautoreconf } src_configure() { - econf --with-libdnet="${EPREFIX}"/usr --with-libevent="${EPREFIX}"/usr + econf \ + --with-libdnet="${EPREFIX}"/usr \ + --with-libevent="${EPREFIX}"/usr } src_install() { - dosbin arpd || die - doman arpd.8 || die + dosbin arpd + doman arpd.8 } diff --git a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch index c0c0f47712a8..598fd0b73777 100644 --- a/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch +++ b/net-misc/arpd/files/arpd-0.2-buildsystem-libevent-test.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2003-02-09 19:30:33.000000000 +0100 -+++ configure.in 2010-09-17 00:33:36.138294836 +0200 +--- a/configure.in ++++ b/configure.in @@ -62,7 +62,7 @@ ;; *) diff --git a/net-misc/arpd/files/arpd-0.2-libevent.patch b/net-misc/arpd/files/arpd-0.2-libevent.patch index 2d5998f8c8d3..367ae551ad98 100644 --- a/net-misc/arpd/files/arpd-0.2-libevent.patch +++ b/net-misc/arpd/files/arpd-0.2-libevent.patch @@ -1,5 +1,5 @@ ---- arpd.orig/arpd.c 2010-02-03 20:03:07.098748175 +0100 -+++ arpd/arpd.c 2010-02-03 20:06:24.469749941 +0100 +--- a/arpd.c ++++ b/arpd.c @@ -445,9 +445,6 @@ void terminate_handler(int sig) diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch index 732ed16c92d7..b8d2bbdb94b0 100644 --- a/net-misc/arpd/files/arpd.c.patch +++ b/net-misc/arpd/files/arpd.c.patch @@ -1,5 +1,5 @@ ---- arpd.c.orig 2005-03-30 15:13:37.136590624 -0700 -+++ arpd.c 2005-03-30 15:23:50.295231384 -0700 +--- a/arpd.c ++++ b/arpd.c @@ -265,7 +265,7 @@ spa->addr_ip, tha->addr_eth, tpa->addr_ip); diff --git a/net-misc/netkit-bootpd/metadata.xml b/net-misc/netkit-bootpd/metadata.xml index a535b8852829..3c3d5ced6412 100644 --- a/net-misc/netkit-bootpd/metadata.xml +++ b/net-misc/netkit-bootpd/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>xmw@gentoo.org</email> -<name>Michael Weber</name> -</maintainer> + <maintainer type="person"> + <email>xmw@gentoo.org</email> + <name>Michael Weber</name> + </maintainer> </pkgmetadata> diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild index 7ae6c8941158..cb70f0e56efd 100644 --- a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild +++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit eutils toolchain-funcs +EAPI=6 + +inherit toolchain-funcs MY_P=${P/netkit-} @@ -17,20 +18,22 @@ IUSE="" S=${WORKDIR}/${MY_P} -src_prepare() { - epatch "${FILESDIR}"/${P}.patch +PATCHES=( "${FILESDIR}"/${P}.patch ) + +src_configure() { + tc-export CC } src_compile() { - tc-export CC - emake linux || die + emake linux } src_install() { - dosbin bootp{d,ef,gw,test} || die + dosbin bootp{d,ef,gw,test} + local x for x in d ef gw test; do - dosym bootp${x} /usr/sbin/in.bootp${x} || die + dosym bootp${x} /usr/sbin/in.bootp${x} done doman *.5 *.8 diff --git a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch b/net-misc/openr2/files/1.3.0-respect-user-cflags.patch deleted file mode 100644 index 7a8f23f3f29c..000000000000 --- a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr openr2-1.3.0.ORIG//configure.in openr2-1.3.0/configure.in ---- openr2-1.3.0.ORIG//configure.in 2010-05-13 11:59:14.000000000 +0100 -+++ openr2-1.3.0/configure.in 2010-05-13 11:59:35.000000000 +0100 -@@ -25,11 +25,6 @@ - AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE - --# let's default to compile with debugging information --# most users will not even care about it --CFLAGS='-ggdb3 -O0' --CXXFLAGS='-ggdb3 -O0' -- - AC_PROG_CC - AC_PROG_LIBTOOL - AC_LANG([C]) diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch new file mode 100644 index 000000000000..59918934d563 --- /dev/null +++ b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch @@ -0,0 +1,30 @@ +--- a/configure.in ++++ b/configure.in +@@ -25,11 +25,6 @@ + AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE + +-# let's default to compile with debugging information +-# most users will not even care about it +-CFLAGS='-ggdb3 -O0' +-CXXFLAGS='-ggdb3 -O0' +- + AC_PROG_CC + AC_PROG_LIBTOOL + AC_LANG([C]) +diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,10 +1,10 @@ +-AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes + if WANT_OR2_TRACE_STACKS + AM_CFLAGS += -DOR2_TRACE_STACKS + endif + + if HAVE_SVNVERSION +-AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\" ++AM_CFLAGS += -DREVISION=\"0\" + endif + + lib_LTLIBRARIES = libopenr2.la diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild index d00d14389463..3e45c4921241 100644 --- a/net-misc/openr2/openr2-1.3.0.ebuild +++ b/net-misc/openr2/openr2-1.3.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit autotools base +EAPI=6 + +inherit autotools DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol" HOMEPAGE="http://libopenr2.org/" @@ -14,13 +15,21 @@ KEYWORDS="~amd64" IUSE="" RDEPEND="net-misc/dahdi" -PATCHES=( "${FILESDIR}/${PV}-respect-user-cflags.patch" ) +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) src_prepare() { - base_src_prepare + default + mv configure.{in,ac} || die eautoreconf } +src_configure() { + econf --disable-static +} + src_install() { - emake DESTDIR="${D}" install || die + default + find "${D}" -name '*.la' -delete || die } diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest index 7b99e95d1d3b..1d3c1401a0c9 100644 --- a/net-misc/ssvnc/Manifest +++ b/net-misc/ssvnc/Manifest @@ -1,2 +1 @@ -DIST ssvnc-1.0.28.src.tar.gz 542796 BLAKE2B 121d78f18b0bb904b1aa15ccaa220beddabe500e77c9b483ba88b0d228f17a56174d83ca5746ecb4aeaef19e5efe87d47146d06e32f8abf196ae6c9a74a28b84 SHA512 8b86fc3ba971cae72878ba45a775b97b22c537c389d8ae3260e5d5657fe96c6ead51e3871bc8ff47bb5368d7e95c43250814be93508f0d403210b49c8393a712 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092 diff --git a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch deleted file mode 100644 index dc433ac2d145..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.27-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3031380&group_id=243486&atid=1122548 - ---- a/vnc_unixsrc/vncviewer/sockets.c -+++ b/vnc_unixsrc/vncviewer/sockets.c -@@ -32,6 +32,7 @@ - #include <netdb.h> - #include <fcntl.h> - #include <assert.h> -+#include <ctype.h> - #include <vncviewer.h> - - #ifndef SOL_IPV6 ---- a/Makefile -+++ b/Makefile -@@ -21,11 +21,11 @@ - - # N.B. ?= is gnu make specific. Some of the subdir Makefiles are too. - # --PREFIX ?= /usr/local --ROOT ?= -+PREFIX = /usr -+ROOT = $(DESTDIR) - BIN = bin - LIB = lib/ssvnc - MAN = man --MANDIR ?= $(MAN) -+MANDIR = share/$(MAN) - APPS ?= share/applications - BINNAME ?= ssvncviewer -@@ -66,7 +66,6 @@ - - install: all - mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1 -- strip $(VIEWER) - cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB) - cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB) - cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB) ---- a/vncstorepw/Makefile -+++ b/vncstorepw/Makefile -@@ -14,7 +14,6 @@ - - $(CMD): vncauth.o vncstorepw.o d3des.o - PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o -- PATH=$$PATH:$(EPATH) strip $(CMD) - @ls -l $(CMD) - - $(UNWRAP): unwrap.c -@@ -41,7 +40,6 @@ - else \ - PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \ - fi -- PATH=$$PATH:$(EPATH) strip $(ULTDSM) - @ls -l $(ULTDSM) - - test: $(CMD) - diff --git a/net-misc/ssvnc/ssvnc-1.0.28.ebuild b/net-misc/ssvnc/ssvnc-1.0.28.ebuild deleted file mode 100644 index 3e9f88e5d8be..000000000000 --- a/net-misc/ssvnc/ssvnc-1.0.28.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="3" -inherit eutils multilib toolchain-funcs - -DESCRIPTION="VNC viewer that adds encryption security to VNC connections" -HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html" -SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" -IUSE="java" - -RDEPEND="sys-libs/zlib - virtual/jpeg - dev-libs/openssl - dev-lang/tk - net-misc/stunnel - java? ( virtual/jre ) - x11-terms/xterm - x11-libs/libICE - x11-libs/libSM - x11-libs/libXaw - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXp - x11-libs/libXpm - x11-libs/libXt" -DEPEND="${RDEPEND} - java? ( virtual/jdk )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.27-build.patch - - sed -i \ - -e "/^LIB/s:lib/:$(get_libdir)/:" \ - -e "$(use java || echo '/^JSRC/s:=.*:=:')" \ - Makefile - sed -i \ - -e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \ - vncstorepw/Makefile - - cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile - cd "${S}"/vnc_unixsrc/vncviewer - sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in - cp "${FILESDIR}"/Makefile.vncviewer Makefile -} - -src_compile() { - tc-export AR CC CXX RANLIB - emake all || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || \ - die "make install failed" - dodoc README -} diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild index d0524154cc1c..f31d0f32cd6f 100644 --- a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild +++ b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="java" RDEPEND="sys-libs/zlib - virtual/jpeg - dev-libs/openssl - dev-lang/tk + virtual/jpeg:0 + dev-libs/openssl:0= + dev-lang/tk:0 net-misc/stunnel - java? ( virtual/jre ) + java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libICE x11-libs/libSM diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask index ae5ea45d3d0e..1b7096875ce9 100644 --- a/profiles/arch/amd64/no-multilib/package.mask +++ b/profiles/arch/amd64/no-multilib/package.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# David Seifert <soap@gentoo.org> (03 Jan 2018) +# Requires 32-bit multilib compatibility +sys-block/megamgr + # James Le Cuirot <chewi@gentoo.org> (13 Aug 2016) # Steam requires amd64 multilib. These are steam-overlay packages. dev-util/adobe-air-runtime diff --git a/sys-auth/fprint_demo/fprint_demo-0.4.ebuild b/sys-auth/fprint_demo/fprint_demo-0.4.ebuild index 88da0e2f3cbb..9674281223aa 100644 --- a/sys-auth/fprint_demo/fprint_demo-0.4.ebuild +++ b/sys-auth/fprint_demo/fprint_demo-0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 DESCRIPTION="a simple GTK+ application to demonstrate and test libfprint's capabilities" HOMEPAGE="http://www.reactivated.net/fprint/wiki/Fprint_demo" @@ -12,11 +12,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -RDEPEND="sys-auth/libfprint +RDEPEND=" + sys-auth/libfprint x11-libs/gtk+:2" DEPEND="${RDEPEND}" - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README || die -} diff --git a/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild b/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild index 0c1a0b837148..0ad34429a489 100644 --- a/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild +++ b/sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -inherit eutils multilib toolchain-funcs +inherit multilib-minimal toolchain-funcs DESCRIPTION="libnss-cache is a library that serves nss lookups" HOMEPAGE="https://github.com/google/nsscache" @@ -12,23 +12,22 @@ SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="multilib" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-0.10.1-make.patch + "${FILESDIR}"/${PN}-0.10-fix-shadow-test.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.10.1-make.patch - epatch "${FILESDIR}"/${PN}-0.10-fix-shadow-test.patch + default + multilib_copy_sources } -src_compile() { - emake CC="$(tc-getCC)" nss_cache || die - if use multilib && has_multilib_profile; then - emake CC="$(tc-getCC)" nss_cache32 || die - fi +multilib_src_compile() { + emake CC="$(tc-getCC)" nss_cache } -src_install() { - emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die - if use multilib && has_multilib_profile; then - emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install32 || die - fi +multilib_src_install() { + emake DESTDIR="${ED}" LIBDIR="${ED%/}/usr/$(get_libdir)" install } diff --git a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild b/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild index 656e7e1b3841..8179d8611ad5 100644 --- a/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild +++ b/sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -inherit eutils pam +inherit pam DESCRIPTION="a simple PAM module which uses libfprint's functionality for authentication" HOMEPAGE="http://www.reactivated.net/fprint/wiki/Pam_fprint" @@ -14,17 +14,16 @@ SLOT="0" KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" IUSE="" -RDEPEND="sys-auth/libfprint +RDEPEND=" + sys-auth/libfprint sys-libs/pam" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-headers.patch -} +PATCHES=( "${FILESDIR}"/${P}-headers.patch ) src_install() { - dopammod src/${PN}.so || die - newbin src/pamtest pamtest.fprint || die - dobin src/pam_fprint_enroll || die - dodoc AUTHORS ChangeLog NEWS README || die + dopammod src/${PN}.so + newbin src/pamtest pamtest.fprint + dobin src/pam_fprint_enroll + einstalldocs } diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild index 7af8533be7c8..1fc02cd38e08 100644 --- a/sys-auth/realtime-base/realtime-base-0.1.ebuild +++ b/sys-auth/realtime-base/realtime-base-0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 inherit user @@ -17,30 +17,30 @@ IUSE="" DEPEND="" RDEPEND="virtual/pam" +S=${WORKDIR} + limitsdfile=40-${PN}.conf rtgroup=realtime -S=${WORKDIR} - pkg_setup() { enewgroup ${rtgroup} } -print_limitsdfile() { - printf "# Start of ${limitsdfile} from ${P}\n\n" - printf "@${rtgroup}\t-\trtprio\t99\n" - printf "@${rtgroup}\t-\tmemlock\tunlimited\n" - printf "\n# End of ${limitsdfile} from ${P}\n" -} - src_compile() { einfo "Generating ${limitsdfile}" - print_limitsdfile > "${S}/${limitsdfile}" + cat > ${limitsdfile} <<- EOF || die + # Start of ${limitsdfile} from ${P} + + @${rtgroup} - rtprio 99 + @${rtgroup} - memlock unlimited + + # End of ${limitsdfile} from ${P} + EOF } src_install() { insinto /etc/security/limits.d/ - doins "${S}/${limitsdfile}" || die + doins ${limitsdfile} } pkg_postinst() { diff --git a/sys-block/megamgr/Manifest b/sys-block/megamgr/Manifest index b6ec0bccc994..3391acfcacde 100644 --- a/sys-block/megamgr/Manifest +++ b/sys-block/megamgr/Manifest @@ -1 +1 @@ -DIST ut_linux_mgr_5.20.zip 253549 SHA256 e7313ed8f59897f132ffed55ed606f19dc72a5d529e6b647cb157a39f0d79123 SHA512 3f942ab3d7a192bc1a945945d20545ffdbbbdd9c4af238701cf7357fe5b3f405c2e777da7c42908e1acb676499ee87aec261bcad729a4d787f8e098af132bda6 WHIRLPOOL 8efdfa1a152003ab0da0834f101c4da505974ada81eb0633e42d5065b96dcd48638da8145ac1e43573fe0cb25119bf3579a1d778deb18e1258cbca33e1c6cd28 +DIST ut_linux_mgr_5.20.zip 253549 BLAKE2B eb173d349e5399229f55ec073246993068caea01dcc707ec11d34a418cd42368eb80028e4363cad7e1bb707558e6eb8b629a2071387bff40471daa98d1d14c94 SHA512 3f942ab3d7a192bc1a945945d20545ffdbbbdd9c4af238701cf7357fe5b3f405c2e777da7c42908e1acb676499ee87aec261bcad729a4d787f8e098af132bda6 diff --git a/sys-block/megamgr/megamgr-5.20-r2.ebuild b/sys-block/megamgr/megamgr-5.20-r2.ebuild index d8758416c831..1ebc56400d12 100644 --- a/sys-block/megamgr/megamgr-5.20-r2.ebuild +++ b/sys-block/megamgr/megamgr-5.20-r2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" - -inherit multilib +EAPI=6 DESCRIPTION="LSI Logic MegaRAID Text User Interface management tool" HOMEPAGE="http://www.lsi.com" @@ -15,29 +13,24 @@ SLOT="0" # can remove the distfiles from their mirror anytime. KEYWORDS="~amd64 ~x86" IUSE="" +RESTRICT="mirror fetch" DEPEND="app-arch/unzip" RDEPEND="" -RESTRICT="mirror fetch" - S="${WORKDIR}" QA_PRESTRIPPED="/opt/bin/megamgr" pkg_nofetch() { einfo "Upstream has implement a mandatory clickthrough EULA for distfile download" - einfo "Please visit $SRC_URI" - einfo "And place $A in ${DISTDIR}" -} - -pkg_setup() { - use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; } + einfo "Please visit ${SRC_URI}" + einfo "And place ${A} in ${DISTDIR}" } src_install() { - newdoc ut_linux_${PN##mega}_${PV}.txt ${PN}-release-${PV}.txt - exeinto /opt/bin - newexe megamgr.bin megamgr || die + newexe megamgr.bin megamgr + + newdoc ut_linux_${PN##mega}_${PV}.txt ${PN}-release-${PV}.txt } diff --git a/sys-libs/suacomp/suacomp-0.6.14.ebuild b/sys-libs/suacomp/suacomp-0.6.14.ebuild index be3cecaf4bfc..be3e9886e4e5 100644 --- a/sys-libs/suacomp/suacomp-0.6.14.ebuild +++ b/sys-libs/suacomp/suacomp-0.6.14.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -inherit toolchain-funcs flag-o-matic eutils +inherit flag-o-matic toolchain-funcs DESCRIPTION="library wrapping the interix lib-c to make it less buggy" HOMEPAGE="http://suacomp.sf.net" @@ -21,9 +21,11 @@ get_opts() { local shlibc= local stlibc= + local dir for dir in /usr/lib /usr/lib/x86; do [[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a + local name for name in libc.so.5.2 libc.so.3.5; do [[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; } done @@ -34,23 +36,19 @@ get_opts() { echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}" } -pkg_setup() { +src_prepare() { + [[ ${CHOST} == *-interix6* ]] && eapply "${FILESDIR}"/${P}-strtoll.patch + eapply_user +} + +src_configure() { if use debug; then append-flags -D_DEBUG -D_DEBUG_TRACE fi } -src_prepare() { - [[ ${CHOST} == *-interix6* ]] && epatch "${FILESDIR}"/${P}-strtoll.patch -} - src_compile() { - emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ - CFLAGS="${CFLAGS}" || die "emake install failed" + emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" } src_test() { @@ -59,5 +57,10 @@ src_test() { use debug && v="TEST_VERBOSE=1" use debug && export SUACOMP_DEBUG_OUT=stderr - emake check $(get_opts) ${v} || die "emake check failed" + emake check $(get_opts) ${v} +} + +src_install() { + emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ + CFLAGS="${CFLAGS}" } diff --git a/sys-libs/suacomp/suacomp-9999.ebuild b/sys-libs/suacomp/suacomp-9999.ebuild index c40821304da1..b356312ab407 100644 --- a/sys-libs/suacomp/suacomp-9999.ebuild +++ b/sys-libs/suacomp/suacomp-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit toolchain-funcs flag-o-matic git-2 +inherit flag-o-matic toolchain-funcs git-r3 DESCRIPTION="library wrapping the interix lib-c to make it less buggy" HOMEPAGE="http://suacomp.sf.net" @@ -11,7 +11,6 @@ EGIT_REPO_URI="https://git.code.sf.net/p/suacomp/git" LICENSE="BEER-WARE" SLOT="0" -KEYWORDS="" IUSE="debug" DEPEND="" @@ -21,9 +20,11 @@ get_opts() { local shlibc= local stlibc= + local dir for dir in /usr/lib /usr/lib/x86; do [[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a + local name for name in libc.so.5.2 libc.so.3.5; do [[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; } done @@ -34,7 +35,7 @@ get_opts() { echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}" } -pkg_setup() { +src_configure() { if use debug; then append-flags -D_DEBUG -D_DEBUG_TRACE fi @@ -44,11 +45,6 @@ src_compile() { emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" } -src_install() { - emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ - CFLAGS="${CFLAGS}" -} - src_test() { local v= @@ -57,3 +53,8 @@ src_test() { emake check $(get_opts) ${v} } + +src_install() { + emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ + CFLAGS="${CFLAGS}" +} diff --git a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild index 848cafaec1f4..576645b15f09 100644 --- a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild +++ b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" - -inherit eutils multilib +EAPI=6 MY_P="${P#pidgin-}" + DESCRIPTION="Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam" HOMEPAGE="http://pidgin-bs.sourceforge.net/" SRC_URI="mirror://sourceforge/pidgin-bs/${MY_P}.tar.bz2" @@ -17,7 +16,6 @@ IUSE="" RDEPEND="net-im/pidgin[gtk] x11-libs/gtk+:2" - DEPEND="${RDEPEND} >=dev-util/intltool-0.40 virtual/pkgconfig" @@ -25,6 +23,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" src_install() { - emake install DESTDIR="${D}" || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README + default + find "${D}" -name '*.la' -delete || die } diff --git a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild index 87efacac2590..bcfaf3ba9a2a 100644 --- a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild +++ b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -inherit eutils multilib toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="Pidgin plugin to notify by writing user defined strings to (led control) files" -HOMEPAGE="https://sites.google.com/site/simohmattila/led-notification" MY_PN=${PN/pidgin-/} MY_P=${MY_PN}-${PV} + +DESCRIPTION="Pidgin plugin to notify by writing user defined strings to (led control) files" +HOMEPAGE="https://sites.google.com/site/simohmattila/led-notification" SRC_URI="https://sites.google.com/site/simohmattila/${MY_P}.tar.bz2" LICENSE="GPL-2" @@ -16,27 +17,29 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -RDEPEND="net-im/pidgin[gtk] +RDEPEND=" + net-im/pidgin[gtk] x11-libs/gtk+:2" DEPEND="${RDEPEND} virtual/pkgconfig" S=${WORKDIR}/${MY_P} -src_prepare() { - epatch "${FILESDIR}"/${P}-hardware.patch -} +PATCHES=( "${FILESDIR}"/${P}-hardware.patch ) src_compile() { $(tc-getCC) \ - ${CFLAGS} -fpic $(pkg-config --cflags gtk+-2.0 pidgin) \ + ${CFLAGS} -fPIC \ + ${CPPFLAGS} \ + ${LDFLAGS} \ + $($(tc-getPKG_CONFIG) --cflags gtk+-2.0 pidgin) \ -shared ${MY_PN}.c -o ${MY_PN}.so \ - ${LDFLAGS} $(pkg-config --libs gtk+-2.0 pidgin) || die + $($(tc-getPKG_CONFIG) --libs gtk+-2.0 pidgin) || die } src_install() { - insinto /usr/$(get_libdir)/pidgin - insopts -m755 - doins ${MY_PN}.so || die - dodoc README || die + exeinto /usr/$(get_libdir)/pidgin + doexe ${MY_PN}.so + + einstalldocs } |