summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild2
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild2
-rw-r--r--eclass/multibuild.eclass12
-rw-r--r--net-dns/libidn2/Manifest1
-rw-r--r--net-dns/libidn2/libidn2-2.0.0.ebuild (renamed from net-dns/libidn2/libidn2-0.16-r2.ebuild)16
-rw-r--r--x11-misc/xlockmore/Manifest1
-rw-r--r--x11-misc/xlockmore/xlockmore-5.50.ebuild2
-rw-r--r--x11-misc/xlockmore/xlockmore-5.52.ebuild106
8 files changed, 115 insertions, 27 deletions
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 191048a7f115..b3275998152f 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~hppa"
IUSE="test"
RDEPEND="dev-lang/php:*
!<=dev-php/PEAR-PEAR-1.10.3-r1"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
index dc4a577dfa06..a097da16a520 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
HOMEPAGE="http://pear.php.net/package/${MY_PN}"
SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~hppa"
SLOT="0"
IUSE=""
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index a29218d8d840..0f89e4ec0b83 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -125,18 +125,6 @@ multibuild_foreach_variant() {
_multibuild_run "${@}" \
> >(exec tee -a "${T}/build-${MULTIBUILD_ID}.log") 2>&1
lret=${?}
-
- # make sure no processes are left over
- local leftovers=
- while :; do
- wait -n
- [[ ${?} -eq 127 ]] && break || leftovers=1
- done
-
- if [[ ${leftovers} ]]; then
- ewarn "The multibuild function has left one or more processes running"
- ewarn "in the background. Please report a bug."
- fi
done
[[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret}
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 6e94e500633c..ea57bda7c61d 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1 +1,2 @@
DIST libidn2-0.16.tar.gz 1494295 SHA256 2fad9efff4082ae2143f69df76339ca99379e0e0f4231455f5d3d9d2089c688f SHA512 85f41c79bd2b88f2724383461a78e56b47e52e66e3f088d631a922438742938721d26aeebef17f6ca4fd028d95dfb5b0fa298a96982ef777c07fefe5244d1e73 WHIRLPOOL be10d0e2994e4fa0e31d710b358c7375e9454b4291bd4603a683a6ddb737241442007f04893395b36d7ef636614b6982354840bb07570e2a6b8f6aa2d888996a
+DIST libidn2-2.0.0.tar.xz 1257908 SHA256 039052f2a3c513c56b9961b8afb7379e68a0698032e228953e89b169b88d7838 SHA512 0cc199f05526edebb385cd7ca3bafca341e31cc76ef0efe7e63a07ff1d2830d9d33004dfc51aa245b42fdf0de7eeb807fd18255f58cc2b086e1155beaa738502 WHIRLPOOL daa222e6a3527cbc989a0388cb903e428acd759553e668b97f2ca2b9071067e43a6c23a8b3e52e7bbd98c71788b2ee009ce5f640a09051b5fcca04a50b543d2d
diff --git a/net-dns/libidn2/libidn2-0.16-r2.ebuild b/net-dns/libidn2/libidn2-2.0.0.ebuild
index ba1da393b3a0..20634db29527 100644
--- a/net-dns/libidn2/libidn2-0.16-r2.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.0.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils flag-o-matic multilib-minimal
+inherit eutils flag-o-matic multilib-minimal
DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
SRC_URI="
- mirror://gnu-alpha/libidn/${P}.tar.gz
+ mirror://gnu-alpha/libidn/${P}.tar.xz
"
LICENSE="GPL-2+ LGPL-3+"
@@ -24,14 +24,6 @@ DEPEND="
sys-apps/help2man
"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.12-Werror.patch
- "${FILESDIR}"/${PN}-0.12-examples.patch
- "${FILESDIR}"/${PN}-0.16-gengetopt.patch
- "${FILESDIR}"/${PN}-0.16-cross.patch
- "${FILESDIR}"/${PN}-pkgconfig.diff
-)
-
src_prepare() {
default
@@ -41,8 +33,6 @@ src_prepare() {
append-cppflags -D'error\(E,...\)=exit\(E\)'
fi
- eautoreconf
-
multilib_copy_sources
}
@@ -55,5 +45,7 @@ multilib_src_configure() {
multilib_src_install() {
default
+ rm "${D}"/usr/bin/idn2_noinstall || die
+
prune_libtool_files
}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 0643202d8a2a..9eaaac310036 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,3 +1,4 @@
DIST xlockmore-5.47.tar.xz 1610604 SHA256 94e3adee284eec09dc27405bfc24651446e8c6edd6a5bc565550b08f563a0d8d SHA512 0690255cafa0e32d5b2920a611a76107565591331ef12e442069d4a7fba38b18b43a581f29488969695390aef92d4868681efb9b2a06fbb73960d4bcd4b13484 WHIRLPOOL c76dd5c9111d7e17fcbf4572d95773fd40b14f3895fb5b2e86aa36bc2b15da0b6d1fc5bcbf776da976113a76c7f14caf2507495359e0f8a15996cf574c498903
DIST xlockmore-5.50.tar.xz 1632968 SHA256 635f72df44589d028200acf604093959968a7e19f79c4363a76599615f563a29 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569 WHIRLPOOL 2485b7805632581077554b7f2e460d94c0c094d7470e26550e8f32fb4d794ea4c2a111403542d9c07560cf0a0b2e8076cdc789336d09f3798827546ed68b8451
DIST xlockmore-5.51.tar.xz 1633736 SHA256 47118e718e5c892e52ecb21ff4ccfc65592643696768c57c388095732f42608d SHA512 a9fa83677203dca95b9ba1d43058ddefccb8a2d50adb7c20bb05ac96d87a3f871e4ec63d95923e4ead29cd871c32846ceff03ad9574734fa5d1d062b2c116959 WHIRLPOOL 2cd0782a729a2cdcae7ae9004178dd1329f3798fdb8886ae0a6329b3d3433c5e04ef69b8ce45133191c54a01b3a8a5d1fac9b8daf2e273300fe7e887b4eea9b6
+DIST xlockmore-5.52.tar.xz 1621284 SHA256 dd7898829e29525536b146a136aa8bef0cd75706fbc4b60885f5b2e48305944d SHA512 46eb07cf95577059a6c8bfc3ba4d0540fd4e23f84469b1b20ce2926d5c210032d98d8082e780600c5777d875e5875b1d7427947c29a5625dcb4c40b2d9234adc WHIRLPOOL cb73164419147c18bfedee6b3f22cae033f4c2b8d031efad37cf7b4df9dba15912aef77e6e1ad14a396d71582a9bb89ffddca029cc723877c0e260a8d333aec2
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index 4ca08b8836da..a8b965034af0 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.sillycycle.com/xlock/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
REQUIRED_USE="
diff --git a/x11-misc/xlockmore/xlockmore-5.52.ebuild b/x11-misc/xlockmore/xlockmore-5.52.ebuild
new file mode 100644
index 000000000000..c5181b227ac2
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.52.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="http://www.sillycycle.com/xlock/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+ || ( crypt pam )
+ pam? ( !xlockrc )
+ xlockrc? ( !pam )
+"
+RDEPEND="
+ gtk? ( x11-libs/gtk+:2 )
+ imagemagick? ( media-gfx/imagemagick:= )
+ motif? ( >=x11-libs/motif-2.3:0 )
+ nas? ( media-libs/nas )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+ )
+ pam? ( virtual/pam )
+ truetype? ( media-libs/freetype:2 )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xineramaproto
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.46-freetype261.patch
+ "${FILESDIR}"/${PN}-5.47-CXX.patch
+ "${FILESDIR}"/${PN}-5.47-strip.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+
+ if use opengl && use truetype; then
+ myconf=( --with-ftgl )
+ append-flags -DFTGL213
+ else
+ myconf=( --without-ftgl )
+ fi
+
+ myconf+=(
+ $(use_enable pam)
+ $(use_enable xlockrc)
+ $(use_enable vtlock)
+ $(use_with crypt)
+ $(use_with debug editres)
+ $(use_with gtk gtk2)
+ $(use_with imagemagick magick)
+ $(use_with motif)
+ $(use_with nas)
+ $(use_with opengl mesa)
+ $(use_with opengl)
+ $(use_with truetype freetype)
+ $(use_with truetype ttf)
+ $(use_with xinerama)
+ --disable-mb
+ --enable-appdefaultdir=/usr/share/X11/app-defaults
+ --enable-syslog
+ --enable-vtlock
+ --without-esound
+ --without-gtk
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+ default
+
+ pamd_mimic_system xlock auth
+
+ if use pam; then
+ fperms 755 /usr/bin/xlock
+ else
+ fperms 4755 /usr/bin/xlock
+ fi
+
+ docinto html
+ dodoc docs/xlock.html
+}