diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 2e704de73459..1bf64314a738 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,2 +1 @@
-DIST ncompress-4.2.4.3.tar.gz 32473 SHA256 d410210742ee85470135b1d49dad17086d4e2565b3914a83dc6e0b1e588f84f8 SHA512 261156061852b79f2f6bee3ffe8423dcd540e038f1dfdb9f2dc16d1de691982cfef8a196d69dad4507ed525d787b6f1d3fdef2827f29935bdbb75a5f30f89963 WHIRLPOOL 8926e93ebce0a85e2a4f71c1d0f848a4e616fb645c5021a1119d12af74ad0c89addf5dfb499067fb307e6c52ae5a3bc7ebb11886236f1d4b656890502c614812
DIST ncompress-4.2.4.4.tar.gz 32571 SHA256 b00ba28d3f332b38aa75478a15c1b789957aa6c02d6453471f452c0ec3e6517a SHA512 abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be WHIRLPOOL 8050829ca7010f9a8cd777e9d628c2d1f12205325db3aafb4d11eb9efb9839fa026366803306907fdbfc9fbfc29693c47317535ede220c784fc934fbe121c42f
diff --git a/app-arch/ncompress/ncompress-4.2.4.3.ebuild b/app-arch/ncompress/ncompress-4.2.4.3.ebuild
deleted file mode 100644
index d3934ac01894..000000000000
--- a/app-arch/ncompress/ncompress-4.2.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="Another uncompressor for compatibility"
-HOMEPAGE="https://github.com/vapier/ncompress"
-SRC_URI="mirror://sourceforge/ncompress/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-src_compile() {
- tc-export CC
- emake || die
-}
-
-src_install() {
- dobin compress || die
- dosym compress /usr/bin/uncompress
- doman compress.1
- echo '.so compress.1' > "${D}"/usr/share/man/man1/uncompress.1
- dodoc Acknowleds Changes LZW.INFO README
-}
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index c9ad814e5692..e17443597d34 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -11,5 +11,6 @@
compression.
snappy
+ google/snappy
diff --git a/app-arch/unmakeself/Manifest b/app-arch/unmakeself/Manifest
index 8a8d294b147d..25fee0b2a6fc 100644
--- a/app-arch/unmakeself/Manifest
+++ b/app-arch/unmakeself/Manifest
@@ -1,2 +1 @@
-DIST unmakeself-1.0.tar.bz2 3015 SHA256 076be9222830d36b4ce32ec1b0349284380dd1c35297332db51d8d994cfeee7e SHA512 d9722c6de549d30a9901174515e100ab2dfeeed2900af52031adc8d8a265e62414aee7b005068e6d2c2d9b24766b5e220b84deee34f3e21abadcd977814b1c02 WHIRLPOOL e1a2e5b1b548ad65e84b6f91f8f456d5f6220d4ccb8818f223998db3d61ae633f54f8b01b8b7da6af64623e36e0058e80994b75d5e67947b3af0b7a2052a34ee
DIST unmakeself-1.1.tar.gz 3635 SHA256 b89e3f8406050050c04d2f4dced4e0bc6d5e2e7062ab5c640357a11e4a6ec48e SHA512 3e8a05a907b8807080208300f6c20577587a0e87000c6746ba457c276e4dff37c8d61227bd1db37e60ac20d9532290c4110a1204c8389a8a1e97a121b68c682b WHIRLPOOL 5cda3534bf5db9d3624d501d9a41cb67581a3c6911a8c44f70584cdfc8d4040d7195000efbdbdf5d0337b24d5082b0c1908820cfc26383c72cfa606a3c7ce209
diff --git a/app-arch/unmakeself/unmakeself-1.0.ebuild b/app-arch/unmakeself/unmakeself-1.0.ebuild
deleted file mode 100644
index cb7906b57440..000000000000
--- a/app-arch/unmakeself/unmakeself-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="extracting Makeself archives without having to run the self-extracting shell script"
-HOMEPAGE="http://www.freshports.org/archivers/unmakeself"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
-#http://cvsup.pt.freebsd.org/cgi-bin/cvsweb/cvsweb.cgi/~checkout~/root/ports/ports/archivers/unmakeself/files/unmakeself.c
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/bzip2
- sys-libs/zlib
- app-arch/libarchive"
-RDEPEND="${DEPEND}"
-
-src_compile() {
- $(tc-getCC) ${CFLAGS} ${LDFLAGS} unmakeself.c -larchive -lbz2 -lz -o unmakeself
-}
-
-src_install() {
- dobin unmakeself
-}
diff --git a/app-arch/unzip/unzip-6.0-r1.ebuild b/app-arch/unzip/unzip-6.0-r1.ebuild
deleted file mode 100644
index cdb7572ab5e2..000000000000
--- a/app-arch/unzip/unzip-6.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P="${PN}${PV/.}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ppc ppc64 s390 sh ~sparc x86"
-IUSE="bzip2 unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-no-exec-stack.patch
- sed -i \
- -e '/^CFLAGS/d' \
- -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
- -e '/^STRIP/s:=.*:=true:' \
- -e "s:\:CC=\"$(tc-getCC)\":" \
- -e "s:\:LD=\"$(tc-getCC)\":" \
- -e "s:\:AS=\"$(tc-getCC)\":" \
- -e 's:LF2 = -s:LF2 = :' \
- -e 's:LF = :LF = $(LDFLAGS) :' \
- -e 's:SL = :SL = $(LDFLAGS) :' \
- -e 's:FL = :FL = $(LDFLAGS) :' \
- -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
- unix/Makefile \
- || die "sed unix/Makefile failed"
-}
-
-src_compile() {
- local TARGET
- case ${CHOST} in
- i?86*-*linux*) TARGET=linux_asm ;;
- *linux*) TARGET=linux_noasm ;;
- i?86*-*bsd* | \
- i?86*-dragonfly*) TARGET=freebsd ;; # mislabelled bsd with x86 asm
- *bsd* | *dragonfly*) TARGET=bsd ;;
- *-darwin*) TARGET=macosx ;;
- *) die "Unknown target, you suck" ;;
- esac
-
- [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
- use bzip2 && append-cppflags -DUSE_BZIP2
- use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
- append-cppflags -DLARGE_FILE_SUPPORT #281473
-
- emake \
- -f unix/Makefile \
- ${TARGET} || die "emake failed"
-}
-
-src_install() {
- dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
- dosym unzip /usr/bin/zipinfo || die
- doman man/*.1
- dodoc BUGS History* README ToDo WHERE
-}
diff --git a/app-arch/unzip/unzip-6.0-r2.ebuild b/app-arch/unzip/unzip-6.0-r2.ebuild
deleted file mode 100644
index 1d350a12fcea..000000000000
--- a/app-arch/unzip/unzip-6.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P="${PN}${PV/.}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
- natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-exec-stack.patch
- use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
- sed -i \
- -e '/^CFLAGS/d' \
- -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
- -e '/^STRIP/s:=.*:=true:' \
- -e "s:\:CC=\"$(tc-getCC)\":" \
- -e "s:\:LD=\"$(tc-getCC)\":" \
- -e "s:\:AS=\"$(tc-getCC)\":" \
- -e 's:LF2 = -s:LF2 = :' \
- -e 's:LF = :LF = $(LDFLAGS) :' \
- -e 's:SL = :SL = $(LDFLAGS) :' \
- -e 's:FL = :FL = $(LDFLAGS) :' \
- -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
- unix/Makefile \
- || die "sed unix/Makefile failed"
-}
-
-src_compile() {
- local TARGET
- case ${CHOST} in
- i?86*-*linux*) TARGET=linux_asm ;;
- *linux*) TARGET=linux_noasm ;;
- i?86*-*bsd* | \
- i?86*-dragonfly*) TARGET=freebsd ;; # mislabelled bsd with x86 asm
- *bsd* | *dragonfly*) TARGET=bsd ;;
- *-darwin*) TARGET=macosx ;;
- *) die "Unknown target, you suck" ;;
- esac
-
- [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
- use bzip2 && append-cppflags -DUSE_BZIP2
- use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
- append-cppflags -DLARGE_FILE_SUPPORT #281473
-
- emake \
- -f unix/Makefile \
- ${TARGET} || die "emake failed"
-}
-
-src_install() {
- dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
- dosym unzip /usr/bin/zipinfo || die
- doman man/*.1
- dodoc BUGS History* README ToDo WHERE
-}
diff --git a/app-backup/rdumpfs/Manifest b/app-backup/rdumpfs/Manifest
index d2ad39e5ad89..8249d4f34773 100644
--- a/app-backup/rdumpfs/Manifest
+++ b/app-backup/rdumpfs/Manifest
@@ -1 +1 @@
-DIST rdumpfs-20131002.tar.gz 2373 SHA256 bb02e119e2248ae95eecfbade77370093a544a24b5078132856c70da6d6c3a1d SHA512 29aa4a3ac9a3d22cff24a84fb1db86aa53d78514bb16f25e70f801a83fce9eb9a523929170eaa9562aa76bce682eb52e400c7468220e0ec876978032bf174969 WHIRLPOOL 24a2556514804d11f84c97617882da2740926dc4c1d1970657635df258bf189f0fb81ce48bd953743fcf2e24b0b3213b914c65d0864506efbf723b00569693c2
+DIST rdumpfs-0.1.tar.gz 3054 SHA256 c8c590eae705aedbc386d78e9cd040fb611c39b6948fb218c8559d1fb3147c26 SHA512 54add203d09bff1190c3bd292bd5fde3b81f4b6810f4dc8d1be18f9abfb5334bcbca1aebc00795f4bdce861f356a7b9e5d809cd80475a3c50a21752380570853 WHIRLPOOL e9fb8749d7b2a0c39923828c9dec1eaca67a1e2ee834b392283795cd685c9f72fefc1664bc57680efe12e745204779d85e634c883a02592e26ddbf7fd5dcdcfd
diff --git a/app-backup/rdumpfs/rdumpfs-20131002.ebuild b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
similarity index 71%
rename from app-backup/rdumpfs/rdumpfs-20131002.ebuild
rename to app-backup/rdumpfs/rdumpfs-0.1.ebuild
index a95599654827..34ad10f8337d 100644
--- a/app-backup/rdumpfs/rdumpfs-20131002.ebuild
+++ b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@ inherit vcs-snapshot
COMMIT="b7e8e7b0efd9d73344e022e204f2e99e6321136e"
DESCRIPTION="a rsync-based dump file system backup tool"
HOMEPAGE="https://github.com/chneukirchen/rdumpfs"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="CC0-1.0"
SLOT="0"
@@ -20,7 +20,7 @@ DEPEND=""
RDEPEND="net-misc/rsync[xattr?]"
src_prepare() {
- use xattr || sed -i '/^rsync_args=/s/X//' "${PN}" || die
+ use xattr || sed -i '/RDUMPFS_DEFAULT_ARGS:=/s/aHAX/aHA/' "${PN}" || die
}
src_install() {
diff --git a/app-benchmarks/ltp/Manifest b/app-benchmarks/ltp/Manifest
index 28154314c1d2..cc4f9f87864b 100644
--- a/app-benchmarks/ltp/Manifest
+++ b/app-benchmarks/ltp/Manifest
@@ -1,4 +1,4 @@
-DIST ltp-20130503.tar.bz2 3819156 SHA256 afdb1479e73d4da7f0d4d5d3fe1570bc5fc96e3317d4a5c10c59c046d3dfa4a0 SHA512 efe7c3e5ffba51b03f01ee66d940d400f4f007dcc42ca45f9597fc1a325950ee14f663762280d63004080c717f16f39bc0d53b5905290470952ef5af3725f089 WHIRLPOOL 924cdc730e85d66d8d7655461e0a59a563b7a9039133b4e991a115d20453f46dda158ac82f474fc8d9ea720a4d03fc67d4d55c231c11d35dc3bfdc5b10a7258b
-DIST ltp-20140828.tar.bz2 3914567 SHA256 046069523f04d8be8689c9e3f7f475e11d21c3d97506189a4a5e23c80b77492a SHA512 4963184624c8d6686dd9bda171bb2917a16b782f575e73ac18641ee66070b72f34c1e222936c52e529038854bd8d67d05b286d5f1319fd73098823ddbfe29545 WHIRLPOOL 32ec59ccd3cea3e4cfe8f73c4eb2bf8f8a86fd2fd0f82df8afabe8b62fd8e92fc9d3dbde52875d2be241542a6e3608ea5507d5f6495b11c92bcda475f6a69302
-DIST ltp-20150119.tar.bz2 3920104 SHA256 e0433cb184c57bf4e5493bfbceef3e9ee51a1a9778990fe4e74e62b17b94232f SHA512 ab7a76d700279895442a35507c58d2d1d2e727f3f7dfec067109a8f04bd23d18d0466c20bb1a37af8691bab9260353431e642b493a218b4317357ba8f6aace3a WHIRLPOOL 69c3e79ca8ceb68197ac8905fa7251a31207465d3992c997b4feb4bbd175657b71f667960aed5658aa5e477edf8388ded34a75476d827fb0fa337f4210975f54
-DIST ltp-20150420.tar.bz2 3893685 SHA256 483a6896b526a2972bc76598c8f1c17f7bc875df2dcb239ad5433a6d5977b79d SHA512 ffdf86a0bd63bb08f59c09e41ccf9b5aa2ac1d407fe39fa37dc3874b9cd60fcea9bf8bbe9481bdf1be4f08973e36b35027463db7da686abaf6233c82865f8215 WHIRLPOOL dd78a04c9084894277f56461992fbe118f20fa8b93b0d5452962eb803d71c611c90f3de2187bdc4fbe80b1078b9602f3e8044e0e6312672020c35a998f492edf
+DIST ltp-20130503.tar.gz 4698775 SHA256 34519b6365cae24f8d8bb8a4ec0955d83999b1a4685d87305191cf2be7a2b5a1 SHA512 36ad9f808b41f6f4ee983cd697415ab8883e569268759c249eb680e8aab4147a1425407769af2b3643c117889b8b5da385cbabffe55d2fe04c00e46ef6f71a0e WHIRLPOOL a69888c7e887ba1fbb60811cb5e7b41a7444e0b367fe72fd4ec1c0e6d8f2931577edeac40d8008dae8d8a547cbff013f14dda6540da03f8017cc27ee528c9a66
+DIST ltp-20140828.tar.gz 4690629 SHA256 95febd3db2c33d74b180c532f8bf9a9bac3ce27e2603aee28cad15f85834cde9 SHA512 e685f109d0e74bfd2bcd7604c744872967d3a6d34d5fa8ee87867501da1162b27777f0c3c099836d9d14b2eab319bad6da87cb2e3fabec478cf95b692b4e2fe8 WHIRLPOOL 5cff0a5ef887135f8b1baa4f10df54f5422a22f71a5d417b1c25f0c2b8c9e40d238d743216e2128b6f30ab97b1949df168320198e991a20c455e3c669efb626b
+DIST ltp-20150119.tar.gz 4695541 SHA256 6cba3476e5bef74d21979c45d0629632bfaeaafc4dbbebccd187ba7b6b9dca52 SHA512 5e5624738da08a3f5f5b08d821a73666d6ef9957b62ff72bd12aba0d021c304dae5652956a6af60aa593256cadd98f061759d5a65045ff5b1864956ea5ad5186 WHIRLPOOL 0417bf1c41347aca68b9e9fb3b203c209f36112ecdf7f020d32060ac637949b1cf40e437f976352ebca1d4566394abe2149b14ad946e1fa2f37cf68397c3e610
+DIST ltp-20150420.tar.gz 4673384 SHA256 65a6ed64d55edc77f0ff690e269dc3ef32290d4499ccbb8f24b2cf59dd974408 SHA512 a5d259cf2a984eae1a0e6b7be538f06eb6021e0f961bb7683aaafc1bad347e73690fa5d6ae39beb6c92c9ea69e4160841d0e46ac49ccfa77053f1c7a0a854099 WHIRLPOOL 7d0b26c8a1f99cea1a609545671d6160278cf81c4654fff7dba84688e37b6f6349e3a2b90cb44ef7abf5c7cfad2187543431df23dd5833917f8b446db8425aec
diff --git a/app-benchmarks/ltp/ltp-20130503.ebuild b/app-benchmarks/ltp/ltp-20130503.ebuild
index 82aa09b65a15..e1cf3aa7b4df 100644
--- a/app-benchmarks/ltp/ltp-20130503.ebuild
+++ b/app-benchmarks/ltp/ltp-20130503.ebuild
@@ -6,12 +6,9 @@ EAPI="4"
inherit autotools eutils readme.gentoo
-MY_PN="${PN}-full"
-MY_P="${MY_PN}-${PV}"
-
DESCRIPTION="A testsuite for the linux kernel"
-HOMEPAGE="http://ltp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ltp/LTP%20Source/${P}/${MY_P}.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="http://linux-test-project.github.io/"
+SRC_URI="https://github.com/linux-test-project/ltp/archive/20130503.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -24,8 +21,6 @@ DEPEND="expect? ( dev-tcltk/expect )
RESTRICT="test"
-S="${WORKDIR}"/${MY_P}
-
pkg_setup() {
# Don't create groups
export CREATE=0
diff --git a/app-benchmarks/ltp/ltp-20140828.ebuild b/app-benchmarks/ltp/ltp-20140828.ebuild
index 921376d3fb58..03a7c7e49043 100644
--- a/app-benchmarks/ltp/ltp-20140828.ebuild
+++ b/app-benchmarks/ltp/ltp-20140828.ebuild
@@ -6,12 +6,9 @@ EAPI="4"
inherit autotools eutils readme.gentoo
-MY_PN="${PN}-full"
-MY_P="${MY_PN}-${PV}"
-
DESCRIPTION="A testsuite for the linux kernel"
-HOMEPAGE="http://ltp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ltp/LTP%20Source/${P}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="http://linux-test-project.github.io/"
+SRC_URI="https://github.com/linux-test-project/ltp/archive/20140828.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -24,8 +21,6 @@ DEPEND="expect? ( dev-tcltk/expect )
RESTRICT="test"
-S="${WORKDIR}"/${MY_P}
-
pkg_setup() {
# Don't create groups
export CREATE=0
diff --git a/app-benchmarks/ltp/ltp-20150119.ebuild b/app-benchmarks/ltp/ltp-20150119.ebuild
index 5ef070c52998..389ad670e202 100644
--- a/app-benchmarks/ltp/ltp-20150119.ebuild
+++ b/app-benchmarks/ltp/ltp-20150119.ebuild
@@ -6,12 +6,9 @@ EAPI="5"
inherit autotools eutils readme.gentoo
-MY_PN="${PN}-full"
-MY_P="${MY_PN}-${PV}"
-
DESCRIPTION="A testsuite for the linux kernel"
-HOMEPAGE="http://ltp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ltp/LTP%20Source/${P}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="http://linux-test-project.github.io/"
+SRC_URI="https://github.com/linux-test-project/ltp/archive/20150119.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -24,8 +21,6 @@ DEPEND="expect? ( dev-tcltk/expect )
RESTRICT="test"
-S="${WORKDIR}"/${MY_P}
-
pkg_setup() {
# Don't create groups
export CREATE=0
diff --git a/app-benchmarks/ltp/ltp-20150420.ebuild b/app-benchmarks/ltp/ltp-20150420.ebuild
index 5ef070c52998..b722b946c7b2 100644
--- a/app-benchmarks/ltp/ltp-20150420.ebuild
+++ b/app-benchmarks/ltp/ltp-20150420.ebuild
@@ -6,12 +6,9 @@ EAPI="5"
inherit autotools eutils readme.gentoo
-MY_PN="${PN}-full"
-MY_P="${MY_PN}-${PV}"
-
DESCRIPTION="A testsuite for the linux kernel"
-HOMEPAGE="http://ltp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ltp/LTP%20Source/${P}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="http://linux-test-project.github.io/"
+SRC_URI="https://github.com/linux-test-project/ltp/archive/20150420.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -24,8 +21,6 @@ DEPEND="expect? ( dev-tcltk/expect )
RESTRICT="test"
-S="${WORKDIR}"/${MY_P}
-
pkg_setup() {
# Don't create groups
export CREATE=0
diff --git a/app-benchmarks/ltp/metadata.xml b/app-benchmarks/ltp/metadata.xml
index 803b59bff20c..ac1dee818a2e 100644
--- a/app-benchmarks/ltp/metadata.xml
+++ b/app-benchmarks/ltp/metadata.xml
@@ -21,5 +21,6 @@
ltp
+ linux-test-project/ltp
diff --git a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.03.ebuild b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.03.ebuild
index f54a2558b7ea..2bab320b589c 100644
--- a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.03.ebuild
+++ b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.03.ebuild
@@ -21,6 +21,7 @@ else
fi
IUSE=""
+RESTRICT="test" # needs to communicate with the TPM and gtest is all broken
DEPEND="app-crypt/tpm-tools[pkcs11]
dev-libs/opencryptoki[tpm]
diff --git a/app-editors/gummi/gummi-9999.ebuild b/app-editors/gummi/gummi-9999.ebuild
index 8c828bb39337..d7501cb9a2ce 100644
--- a/app-editors/gummi/gummi-9999.ebuild
+++ b/app-editors/gummi/gummi-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=2
-inherit autotools base eutils subversion
+EAPI=5
+inherit autotools base eutils git-r3
-ESVN_REPO_URI="http://svn.midnightcoding.org/gummi/trunk"
-ESVN_PROJECT="${PN/-svn}"
+EGIT_REPO_URI="https://github.com/alexandervdm/gummi"
DESCRIPTION="Simple LaTeX editor for GTK+ users"
HOMEPAGE="http://gummi.midnightcoding.org"
@@ -16,7 +15,7 @@ SLOT="0"
KEYWORDS=""
IUSE=""
-LANGS="ca da de fr el it nl pt_BR ru zh_TW"
+LANGS="ar ca cs da de el es fr hu it nl pl pt pt_BR ro ru sv zh_CN zh_TW"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
@@ -32,7 +31,7 @@ DEPEND="${RDEPEND}
x11-libs/gtksourceview:2.0
x11-libs/pango"
-DOCS=( AUTHORS ChangeLog README )
+DOCS=( AUTHORS ChangeLog README.md )
src_prepare() {
strip-linguas ${LANGS}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 65e6438baa21..91061a001fe5 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,11 +1,3 @@
-DIST nano-1.3.12.tar.gz 1250777 SHA256 f5537b8a988618fa8524b6a4b0a6950184d37db983b4521ad843b98845da571c SHA512 30d95122486e13159c4e36d4408ab977351d0d46bb28e21b0e867ab6246a3a5a51d987fcca956d66d629753698188bffec34f076a1cf505cbadd6bec4cd54afb WHIRLPOOL a2ef9482ade321ffc231e5bc0429a363389049ab4fbb82f74719003ca3446681805fbcf8c78dd6fad62c0363030e9804f649b297a7c6840fff83148cb031c7d1
-DIST nano-2.0.9.tar.gz 1403773 SHA256 6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f SHA512 9090dc005670998db2d10657e8c37751051a71ea4a6ba514d1c8e36d5d5030c778ede5d2c3734106a92e100e3755add828f3094b3b5c2b41def8e15e674e4907 WHIRLPOOL 4d16cb2c684bf34f441096311778b9249243cc84351af7586ff1bbbbbd7c0fb251548a1fc987cb91a08633b49fb0841e97d3ca79e8392b8f0ff2e12560b2b098
-DIST nano-2.1.10.tar.gz 1478204 SHA256 03af11adace9f6c482a06f5304c5aba5d134972a416ce4368307b604420b2e40 SHA512 647174879abb0658776e9f3c6734db0989cfe1cb445bda616997d24e2955f7df790bf1c6b7d8dd3fe4878c73d589d84c6c1acae6b851dbf6ab623f0992cf284e WHIRLPOOL 8b813d18c9b2d94c1ec11377f9b7467e18a0fd9d425fe84d9209f6a6c4192bbdd1377f78306c489830a563f4aba0962bfd7349086e59cd12fed6ea96ea67531a
-DIST nano-2.2.5.tar.gz 1554750 SHA256 9015945d1badabbada203b37c4779d3dd1066234235c714deb439989c5cd7d9e SHA512 5dd9bd1bccb8ab5c6592310e2e6cee5a59370595ab1ce2065f0d77a6eb58d8e115559a00b17582ccc6321dcd93a557af391e716977d3ce86f99d83b1aad648fc WHIRLPOOL b2b65c589dc4bfc665e3f73a6fa6bfecfc6bae0d68d99a43ec392fd625717b9e3792b868d84fece44622e245c15c8f20d0c97aa129813319327c42cc89fc96c3
-DIST nano-2.3.1.tar.gz 1624332 SHA256 b7bace9a8e543b84736d6ef5ce5430305746efea3aacb24391f692efc6f3c8d3 SHA512 ab8e17f712c0609e5e7e7caeec79c4bb28d1d6e1c837d2a9c2e7a691156f58c6770375d8c410898648a3629a38cf6b3bb2de9a6c02556e62a583c0500a1aec94 WHIRLPOOL ea14ce055f41884956ad5de5e763396522b9f63c8fd64720078f11c1c97e0fbc6f760789fc52bd3f485d1856dda2727899fb8e79cae3c87850ba0ad8793b1a4d
-DIST nano-2.3.2.tar.gz 1725485 SHA256 ff309248071486445609ad4269b798262a1324d7503dc09dea289f5b60106be8 SHA512 c4bf4a152e797e860e9f8aee5091b8e380f5305d3457d5503c2b6187897394510dd756948cce7157fe986bbb9db7a5b98c9cb5794d12cf6399d7e96e0db1be49 WHIRLPOOL 48111c18a50ab5215646b0a85a6f90a55274d349890fee54e18a66028b1b5a79f51c6f2f12a039751342845b3c8e5f58854e3368d7f8f18c1ab94d6f56f40b02
-DIST nano-2.3.3.tar.gz 1812671 SHA256 d80e0fce656b5cd2f327ea599c708c897dc1b8c608e87c756d63c79e97e8cc19 SHA512 542a12ac7dd8bd48b69e7c3c4850b5757372c0abb2082f12ca049a5857137ef93a7225ca9f23b8aaa934c639c2c1c1d54ae40da868b7c4adf3b3cfc9dec16a95 WHIRLPOOL a9b7c9d2f2904e588f0847d2b897649e780ca489c1240da49a5afdabf10c588191c8cbd3a6360409a26e24ad5604cb12172bb9680200e3edbad2bd94cb5fc3ca
-DIST nano-2.3.4.tar.gz 1812943 SHA256 1774129f4b933df5dbfdf45c4ecdbfc19eb6ff8c2fc6ad43c7f392aa7cd998c1 SHA512 5f0e3d170cce60a6b20647607745373727700fbb59d579ce5f62fd5915568ef0065f5e0e2923812a321dd3b13c77ab9231fd62f7b2a86965925d1da675fa646b WHIRLPOOL 2c703bbc79304a28c06154a451a5035967101ecc82cddbd005cb1a6599466d8b54c944f2aef9dd6c7f9b7a171b705177e3d0e7a496c43ffca39000244371547e
DIST nano-2.3.6.tar.gz 1816012 SHA256 a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534 SHA512 00d66dbbd1ee59b3d606af8688599ce627aa98cee494611e255293347b9aa4f3f583820ac28adae5f7209410a28669cdd5211258411d83364d3eb788d909bb73 WHIRLPOOL 6900e40e41f7bbd23a0dc76fe24bbf29c46b65bead328cb574008045f397e92643a7cee35605ef044e1921029dca54e49831548828490abbf24b2c63f0f9092b
DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd SHA512 7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d WHIRLPOOL 1e4aaaa67c44bf051210b9c65db80c30189606fc2ba0d3e1a6802a41e7244901e60858ad412a0c6ee6e0eaa90d65925d8c954b398387cc12109a626811d8ad07
DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a
diff --git a/app-editors/nano/files/nano-1.3.12-fix2.patch b/app-editors/nano/files/nano-1.3.12-fix2.patch
deleted file mode 100644
index 1c6ba22f3ab3..000000000000
--- a/app-editors/nano/files/nano-1.3.12-fix2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru nano-1.3.12/src/rcfile.c nano-1.3.12-fix2/src/rcfile.c
---- nano-1.3.12/src/rcfile.c 2006-06-07 22:50:56.000000000 -0400
-+++ nano-1.3.12-fix2/src/rcfile.c 2006-07-18 19:22:30.000000000 -0400
-@@ -834,9 +834,11 @@
- rcfile_error(N_("Unknown flag \"%s\""), option);
- }
-
-+#ifdef ENABLE_COLOR
- if (endsyntax != NULL && endcolor == NULL)
- rcfile_error(N_("Syntax \"%s\" has no color commands"),
- endsyntax->desc);
-+#endif
-
- free(buf);
- fclose(rcstream);
diff --git a/app-editors/nano/files/nano-1.3.12-path.patch b/app-editors/nano/files/nano-1.3.12-path.patch
deleted file mode 100644
index b8b2a7e11ff8..000000000000
--- a/app-editors/nano/files/nano-1.3.12-path.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -ur nano-1.3.12/src/files.c nano-1.3.12-fixed/src/files.c
---- nano-1.3.12/src/files.c 2006-06-14 09:19:43.000000000 -0400
-+++ nano-1.3.12-fixed/src/files.c 2006-07-05 11:44:17.000000000 -0400
-@@ -902,21 +902,29 @@
- * able to go there. */
- char *get_full_path(const char *origpath)
- {
-- char *d_here, *d_there = NULL;
-+ struct stat fileinfo;
-+ char *d_here, *d_there, *d_there_file = NULL;
-+ const char *last_slash;
-+ bool path_only;
-
- if (origpath == NULL)
- return NULL;
-
-- /* Get the current directory. */
-+ /* Get the current directory. If it doesn't exist, back up and try
-+ * again until we get a directory that does, and use that as the
-+ * current directory. */
- d_here = charalloc(PATH_MAX + 1);
- d_here = getcwd(d_here, PATH_MAX + 1);
-
-- if (d_here != NULL) {
-- const char *last_slash;
-- char *d_there_file = NULL;
-- bool path_only;
-- struct stat fileinfo;
-+ while (d_here == NULL) {
-+ if (chdir("..") == -1)
-+ break;
-+
-+ d_here = getcwd(d_here, PATH_MAX + 1);
-+ }
-
-+ /* If we succeeded, canonicalize it in d_here. */
-+ if (d_here != NULL) {
- align(&d_here);
-
- /* If the current directory isn't "/", tack a slash onto the end
-@@ -925,89 +933,91 @@
- d_here = charealloc(d_here, strlen(d_here) + 2);
- strcat(d_here, "/");
- }
-+ /* Otherwise, set d_here to "". */
-+ } else
-+ d_here = mallocstrcpy(NULL, "");
-
-- d_there = real_dir_from_tilde(origpath);
-+ d_there = real_dir_from_tilde(origpath);
-
-- assert(d_there != NULL);
-+ assert(d_there != NULL);
-
-- /* Stat d_there. If stat() fails, assume that d_there refers to
-- * a new file that hasn't been saved to disk yet. Set path_only
-- * to TRUE if d_there refers to a directory, and FALSE if
-- * d_there refers to a file. */
-- path_only = !stat(d_there, &fileinfo) &&
-- S_ISDIR(fileinfo.st_mode);
--
-- /* If path_only is TRUE, make sure d_there ends in a slash. */
-- if (path_only) {
-- size_t d_there_len = strlen(d_there);
--
-- if (d_there[d_there_len - 1] != '/') {
-- d_there = charealloc(d_there, d_there_len + 2);
-- strcat(d_there, "/");
-- }
-- }
-+ /* If stat()ing d_there fails, assume that d_there refers to a new
-+ * file that hasn't been saved to disk yet. Set path_only to TRUE
-+ * if d_there refers to a directory, and FALSE otherwise. */
-+ path_only = stat(d_there, &fileinfo) == 0 &&
-+ S_ISDIR(fileinfo.st_mode);
-
-- /* Search for the last slash in d_there. */
-- last_slash = strrchr(d_there, '/');
-+ /* If path_only is TRUE, make sure d_there ends in a slash. */
-+ if (path_only) {
-+ size_t d_there_len = strlen(d_there);
-
-- /* If we didn't find one, then make sure the answer is in the
-- * format "d_here/d_there". */
-- if (last_slash == NULL) {
-- assert(!path_only);
-+ if (d_there[d_there_len - 1] != '/') {
-+ d_there = charealloc(d_there, d_there_len + 2);
-+ strcat(d_there, "/");
-+ }
-+ }
-
-- d_there_file = d_there;
-- d_there = d_here;
-- } else {
-- /* If path_only is FALSE, then save the filename portion of
-- * the answer, everything after the last slash, in
-- * d_there_file. */
-- if (!path_only)
-- d_there_file = mallocstrcpy(NULL, last_slash + 1);
--
-- /* And remove the filename portion of the answer from
-- * d_there. */
-- null_at(&d_there, last_slash - d_there + 1);
--
-- /* Go to the path specified in d_there. */
-- if (chdir(d_there) == -1) {
-- free(d_there);
-- d_there = NULL;
-- } else {
-- /* Get the full path and save it in d_there. */
-- free(d_there);
-+ /* Search for the last slash in d_there. */
-+ last_slash = strrchr(d_there, '/');
-
-- d_there = charalloc(PATH_MAX + 1);
-- d_there = getcwd(d_there, PATH_MAX + 1);
-+ /* If we didn't find one, then make sure the answer is in the format
-+ * "d_here/d_there". */
-+ if (last_slash == NULL) {
-+ assert(!path_only);
-
-- if (d_there != NULL) {
-- align(&d_there);
-+ d_there_file = d_there;
-+ d_there = d_here;
-+ } else {
-+ /* If path_only is FALSE, then save the filename portion of the
-+ * answer (everything after the last slash) in d_there_file. */
-+ if (!path_only)
-+ d_there_file = mallocstrcpy(NULL, last_slash + 1);
-+
-+ /* And remove the filename portion of the answer from
-+ * d_there. */
-+ null_at(&d_there, last_slash - d_there + 1);
-+
-+ /* Go to the path specified in d_there. */
-+ if (chdir(d_there) == -1) {
-+ free(d_there);
-+ d_there = NULL;
-+ } else {
-+ free(d_there);
-
-- if (strcmp(d_there, "/") != 0) {
-- /* Make sure d_there ends in a slash. */
-- d_there = charealloc(d_there,
-- strlen(d_there) + 2);
-- strcat(d_there, "/");
-- }
-- } else
-- /* If we couldn't get the full path, set path_only
-- * to TRUE so that we clean up correctly, free all
-- * allocated memory, and return NULL. */
-- path_only = TRUE;
--
-- /* Finally, go back to the path specified in d_here,
-- * where we were before. */
-- chdir(d_here);
-- }
-+ /* Get the full path. */
-+ d_there = charalloc(PATH_MAX + 1);
-+ d_there = getcwd(d_there, PATH_MAX + 1);
-+
-+ /* If we succeeded, canonicalize it in d_there. */
-+ if (d_there != NULL) {
-+ align(&d_there);
-+
-+ /* If the current directory isn't "/", tack a slash onto
-+ * the end of it. */
-+ if (strcmp(d_there, "/") != 0) {
-+ d_there = charealloc(d_there, strlen(d_there) + 2);
-+ strcat(d_there, "/");
-+ }
-+ } else
-+ /* Otherwise, set path_only to TRUE, so that we clean up
-+ * correctly, free all allocated memory, and return
-+ * NULL. */
-+ path_only = TRUE;
-+
-+ /* Finally, go back to the path specified in d_here,
-+ * where we were before. We don't check for a chdir()
-+ * error, since we can do nothing then. */
-+ chdir(d_here);
-
- /* Free d_here, since we're done using it. */
- free(d_here);
- }
-
-- /* At this point, if path_only is FALSE and d_there exists,
-+ /* At this point, if path_only is FALSE and d_there isn't NULL,
- * d_there contains the path portion of the answer and
- * d_there_file contains the filename portion of the answer. If
-- * this is the case, tack d_there_file onto the end of
-- * d_there, so that d_there contains the complete answer. */
-+ * this is the case, tack the latter onto the end of the former.
-+ * d_there will then contain the complete answer. */
- if (!path_only && d_there != NULL) {
- d_there = charealloc(d_there, strlen(d_there) +
- strlen(d_there_file) + 1);
diff --git a/app-editors/nano/files/nano-1.3.12-scroll.patch b/app-editors/nano/files/nano-1.3.12-scroll.patch
deleted file mode 100644
index f5d533633224..000000000000
--- a/app-editors/nano/files/nano-1.3.12-scroll.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix from upstream
-
-diff -ur nano-1.3.12/src/move.c nano-1.3.12-fixed/src/move.c
---- nano-1.3.12/src/move.c 2006-05-21 22:08:49.000000000 -0400
-+++ nano-1.3.12-fixed/src/move.c 2006-07-06 17:01:03.000000000 -0400
-@@ -521,6 +521,16 @@
-
- /* Scroll the edit window up one line. */
- edit_scroll(UP, 1);
-+
-+ /* If we're not on the first line of the edit window, update the
-+ * line we were on before and the line we're on now. The former
-+ * needs to be redrawn if we're not on the first page, and the
-+ * latter needs to be drawn unconditionally. */
-+ if (openfile->current_y > 0) {
-+ if (need_vertical_update(0))
-+ update_line(openfile->current->next, 0);
-+ update_line(openfile->current, openfile->current_x);
-+ }
- }
- #endif /* !NANO_TINY */
-
-@@ -574,6 +584,16 @@
-
- /* Scroll the edit window down one line. */
- edit_scroll(DOWN, 1);
-+
-+ /* If we're not on the last line of the edit window, update the line
-+ * we were on before and the line we're on now. The former needs to
-+ * be redrawn if we're not on the first page, and the latter needs
-+ * to be drawn unconditionally. */
-+ if (openfile->current_y < editwinrows - 1) {
-+ if (need_vertical_update(0))
-+ update_line(openfile->current->prev, 0);
-+ update_line(openfile->current, openfile->current_x);
-+ }
- }
- #endif /* !NANO_TINY */
-
diff --git a/app-editors/nano/files/nano-2.3.1-bind-unbind-docs.patch b/app-editors/nano/files/nano-2.3.1-bind-unbind-docs.patch
deleted file mode 100644
index 300ee2d24ee1..000000000000
--- a/app-editors/nano/files/nano-2.3.1-bind-unbind-docs.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 5afd6d3e9558f8295496f7c59c765947e7f19d8a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Mon, 28 Nov 2011 15:37:02 -0500
-Subject: [PATCH 1/2] nanorc(5): fix bind/unbind documentation
-
-The unbind section is listed after valid key/menu/functions, but tries
-to say those sections come after it. So reorganization the section so
-that bind/unbind comes first, and then we cover the key/menu/functions
-after both of them.
-
-Signed-off-by: Mike Frysinger
----
- doc/man/nanorc.5 | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
-index da33179..2da71ab 100644
---- a/doc/man/nanorc.5
-+++ b/doc/man/nanorc.5
-@@ -282,9 +282,19 @@ Read in self-contained color syntaxes from \fIsyntaxfile\fP. Note that
- .SH KEY BINDINGS
- Key bindings may be reassigned via the following commands:
- .TP
--.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
-+.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
- Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
--context of menu \fImenu\fP. The format of \fIkey\fP should be one of:
-+context of menu \fImenu\fP.
-+.TP
-+.B unbind \fIkey\fP \fImenu\fP
-+Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all
-+menus by using \fIall\fP. Same key syntax as for binding.
-+Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
-+context of menu \fImenu\fP.
-+.TP
-+
-+The format of \fIkey\fP should be one of:
-+
- .TP
- .B ^
- followed by an alpha character or the word "Space".
-@@ -298,8 +308,10 @@ Example: M-C
- followed by a numeric value from 1 to 16.
- Example: F10
- .TP
--Valid function names to be bound include:
--.TP 3
-+
-+Valid \fIfunction\fP names to be bound include:
-+
-+.TP 2
- .B help
- Invoke the help menu.
- .TP
-@@ -506,8 +518,9 @@ Toggle whether long lines will be wrapped to the next line.
- Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
- .TP
-
--Valid menu sections are:
--.TP
-+Valid \fImenu\fP sections are:
-+
-+.TP 2
- .B main
- The main editor window where text is entered.
- .TP
-@@ -549,13 +562,6 @@ The 'go to directory' menu.
- .TP
- .B all
- A special name meaning: apply to all menus where this function exists.
--
--.TP
--.B unbind \fIkey\fP \fImenu\fP
--Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all
--menus by using \fIall\fP. Same key syntax as for binding.
--Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
--context of menu \fImenu\fP. The format of \fIkey\fP should be one of:
- .SH FILES
- .TP
- .I SYSCONFDIR/nanorc
---
-1.7.9.7
-
-From 4b3e912d4a5c3561d1cfaf944d33ba9c30a9a555 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Mon, 28 Nov 2011 15:38:26 -0500
-Subject: [PATCH 2/2] nanorc syntax: add bind/unbind commands
-
-We don't currently handle the bind/unbind commands, so adding them to
-your nanorc file with colorization enabled makes it look like they're
-not actually supported.
-
-Signed-off-by: Mike Frysinger
----
- doc/syntax/nanorc.nanorc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
-index bda5f4f..287be56 100644
---- a/doc/syntax/nanorc.nanorc
-+++ b/doc/syntax/nanorc.nanorc
-@@ -2,10 +2,12 @@
- ##
- syntax "nanorc" "\.?nanorc$"
- ## Possible errors and parameters
--icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
-+icolor brightwhite "^[[:space:]]*((un)?(bind|set)|include|syntax|i?color).*$"
- ## Keywords
- icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|poslog|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>"
--icolor green "^[[:space:]]*(set|unset|include|syntax|header|magic)\>"
-+icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]+[[:alpha:]]+[[:space:]]*$"
-+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space)|F([0-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]*$"
-+icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic)\>"
- ## Colors
- icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
- icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
---
-1.7.9.7
diff --git a/app-editors/nano/files/nano-2.3.1-drop-target.patch b/app-editors/nano/files/nano-2.3.1-drop-target.patch
deleted file mode 100644
index 3b5647675090..000000000000
--- a/app-editors/nano/files/nano-2.3.1-drop-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0708d921211fa0f89288690593c406a682b2c826 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Tue, 14 Jun 2011 16:00:52 -0400
-Subject: [PATCH] drop --target as it makes no sense
-
-Since nano doesn't produce code, the --target option to configure
-doesn't make sense. So only support --{build,host} since those are
-what we need in order to cross-compile.
-
-Signed-off-by: Mike Frysinger
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c590737..3eb61c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@
-
- AC_INIT([GNU nano], [2.3.1], [nano-devel@gnu.org], [nano])
- AC_CONFIG_SRCDIR([src/nano.c])
--AC_CANONICAL_TARGET([])
-+AC_CANONICAL_HOST
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([config.h])
-
---
-1.7.9.7
-
diff --git a/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch b/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
deleted file mode 100644
index c775e2988b46..000000000000
--- a/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 7051588fee7a20a69c67c8899b3e6c35ebf51fbf Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Sat, 25 Aug 2012 23:03:22 -0400
-Subject: [PATCH] gentoo syntax: update
-
-Update to newer EAPIs, and fold in updated shell changes too.
-Much of this is based on work by Davide.
-
-Reported-by: Davide Pesavento
-Signed-off-by: Mike Frysinger
----
- doc/syntax/gentoo.nanorc | 46 +++++++++++++++++++++++++++-------------------
- 1 file changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc
-index 2ad1597..ad89fce 100644
---- a/doc/syntax/gentoo.nanorc
-+++ b/doc/syntax/gentoo.nanorc
-@@ -2,30 +2,38 @@
- ##
- syntax "ebuild" "\.e(build|class)$"
- ## All the standard portage functions
--color brightgreen "^src_(unpack|prepare|configure|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
-+color brightgreen "(^|\"
-+color brightgreen "^pkg_(config|nofetch|pretend|setup|(pre|post)(inst|rm))\>"
-+color brightgreen "\"
- ## Highlight bash related syntax
--color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
--color green "\<(declare|eval|exec|let)\>"
--color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
--color green "-[edfgruwxL]\>"
--color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
-+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
-+color green "\<(declare|eval|exec|export|let|local)\>"
-+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
-+color green "-[defhnrsuwxzL]\>"
-+color green "-(eq|ne|gt|lt|ge|le)\>"
- ## Highlight variables ... official portage ones in red, all others in bright red
--color brightred "\$\{?[a-zA-Z_0-9]+\}?"
--color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|RESTRICT|USERLAND)\>"
--color red "\<(S|D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|ROOT|WORKDIR)\>" "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\"
--color red "\" "\" "\"
-+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
-+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
-+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
-+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>"
-+color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\"
-+color red "\"
-+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\" "\"
- ## Highlight portage commands
--color magenta "\
+
+ refind
+
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index e08b3507491a..3115e9bca3aa 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,4 +1,3 @@
DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79
-DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
-DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
-DIST glusterfs-3.5.3.tar.gz 5021529 SHA256 d805d77da721e6fcb839f1208a9315b4f37b9d2a12c375dd47e5db4a60f5b6c2 SHA512 5a360c9d5180d1e59b8cac9900e4cf776aebf59fd59cca6a0ef27a84cae3781c8c5640b253c73888af751344dce9fd19c1b26bd9aa590ba4fc860143c990f30a WHIRLPOOL a08d3fc6f66dd4191d95611e1b626d8b393e2b8620800039cde20fcebe1643dc2cfe9e7eb3ce3be31aa4f17b8fc881060d40e3493ce189b93668716e2c7ae86d
+DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068
+DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
new file mode 100644
index 000000000000..af5332bc9b1e
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
@@ -0,0 +1,547 @@
+diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
+--- a/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200
++++ b/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 11:00:36.322686236 +0200
+@@ -3,7 +3,7 @@
+ transport_LTLIBRARIES = rdma.la
+ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+
+-rdma_la_LDFLAGS = -module -avoid-version -nostartfiles
++rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared
+
+ rdma_la_SOURCES = rdma.c name.c
+ rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej
+diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
+--- a/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200
++++ b/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -3,7 +3,7 @@
+ rpctransport_LTLIBRARIES = socket.la
+ rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
+
+-socket_la_LDFLAGS = -module -avoid-version
++socket_la_LDFLAGS = -module -avoid-version -shared
+
+ socket_la_SOURCES = socket.c name.c
+ socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
+diff -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
+--- a/xlators/cluster/afr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/afr/src/Makefile.am 2015-08-28 11:01:31.603219323 +0200
+@@ -10,11 +10,11 @@
+ afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \
+ afr-self-heal-name.c
+
+-afr_la_LDFLAGS = -module -avoid-version
++afr_la_LDFLAGS = -module -avoid-version -shared
+ afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) afr.c
+ afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+-pump_la_LDFLAGS = -module -avoid-version
++pump_la_LDFLAGS = -module -avoid-version -shared
+ pump_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) pump.c
+ pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+Only in b/xlators/cluster/afr/src: Makefile.am.orig
+Only in b/xlators/cluster/afr/src: Makefile.am.rej
+diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
+--- a/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -11,13 +11,13 @@
+ nufa_la_SOURCES = $(dht_common_source) nufa.c
+ switch_la_SOURCES = $(dht_common_source) switch.c
+
+-dht_la_LDFLAGS = -module -avoid-version
++dht_la_LDFLAGS = -module -avoid-version -shared
+ dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+-nufa_la_LDFLAGS = -module -avoid-version
++nufa_la_LDFLAGS = -module -avoid-version -shared
+ nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+-switch_la_LDFLAGS = -module -avoid-version
++switch_la_LDFLAGS = -module -avoid-version -shared
+ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+ noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h \
+Only in b/xlators/cluster/dht/src: Makefile.am.orig
+diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
+--- a/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = stripe.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
+
+-stripe_la_LDFLAGS = -module -avoid-version
++stripe_la_LDFLAGS = -module -avoid-version -shared
+
+ stripe_la_SOURCES = stripe.c stripe-helpers.c \
+ $(top_builddir)/xlators/lib/src/libxlator.c
+Only in b/xlators/cluster/stripe/src: Makefile.am.orig
+diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
+--- a/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = error-gen.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+
+-error_gen_la_LDFLAGS = -module -avoid-version
++error_gen_la_LDFLAGS = -module -avoid-version -shared
+
+ error_gen_la_SOURCES = error-gen.c
+ error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
+--- a/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = io-stats.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+
+-io_stats_la_LDFLAGS = -module -avoid-version
++io_stats_la_LDFLAGS = -module -avoid-version -shared
+
+ io_stats_la_SOURCES = io-stats.c
+ io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
+--- a/xlators/debug/trace/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/debug/trace/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = trace.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
+
+-trace_la_LDFLAGS = -module -avoid-version
++trace_la_LDFLAGS = -module -avoid-version -shared
+
+ trace_la_SOURCES = trace.c
+ trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
+--- a/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200
++++ b/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:16:28.051864039 +0200
+@@ -3,7 +3,7 @@
+ xlator_LTLIBRARIES = crypt.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+
+-crypt_la_LDFLAGS = -module -avoid-version
++crypt_la_LDFLAGS = -module -avoid-version -shared
+
+ crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
+ crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
+Only in b/xlators/encryption/crypt/src: Makefile.am.orig
+Only in b/xlators/encryption/crypt/src: Makefile.am.rej
+diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
+--- a/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = rot-13.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
+
+-rot_13_la_LDFLAGS = -module -avoid-version
++rot_13_la_LDFLAGS = -module -avoid-version -shared
+
+ rot_13_la_SOURCES = rot-13.c
+ rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
+--- a/xlators/features/changelog/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/changelog/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -5,7 +5,7 @@
+ noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
+ changelog-misc.h changelog-encoders.h changelog-notifier.h
+
+-changelog_la_LDFLAGS = -module -avoid-version
++changelog_la_LDFLAGS = -module -avoid-version -shared
+
+ changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
+ changelog-encoders.c changelog-notifier.c changelog-barrier.c
+Only in b/xlators/features/changelog/src: Makefile.am.orig
+diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
+--- a/xlators/features/compress/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200
++++ b/xlators/features/compress/src/Makefile.am 2015-08-28 11:17:19.492360095 +0200
+@@ -4,7 +4,7 @@
+
+ noinst_HEADERS = cdc.h cdc-mem-types.h
+
+-cdc_la_LDFLAGS = -module -avoid-version
++cdc_la_LDFLAGS = -module -avoid-version -shared
+
+ cdc_la_SOURCES = cdc.c cdc-helper.c
+ cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
+Only in b/xlators/features/compress/src: Makefile.am.rej
+diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
+--- a/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = gfid-access.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-gfid_access_la_LDFLAGS = -module -avoid-version
++gfid_access_la_LDFLAGS = -module -avoid-version -shared
+
+ gfid_access_la_SOURCES = gfid-access.c
+ gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am
+--- a/xlators/features/index/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/index/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = index.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-index_la_LDFLAGS = -module -avoid-version
++index_la_LDFLAGS = -module -avoid-version -shared
+
+ index_la_SOURCES = index.c
+ index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am
+--- a/xlators/features/locks/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/locks/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = locks.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-locks_la_LDFLAGS = -module -avoid-version
++locks_la_LDFLAGS = -module -avoid-version -shared
+
+ locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \
+ clear.c
+diff -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
+--- a/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = mac-compat.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-mac_compat_la_LDFLAGS = -module -avoid-version
++mac_compat_la_LDFLAGS = -module -avoid-version -shared
+
+ mac_compat_la_SOURCES = mac-compat.c
+ mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am
+--- a/xlators/features/marker/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/marker/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = marker.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-marker_la_LDFLAGS = -module -avoid-version
++marker_la_LDFLAGS = -module -avoid-version -shared
+
+ marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c
+ marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
+--- a/xlators/features/protect/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/protect/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,15 +2,15 @@
+
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-prot_dht_la_LDFLAGS = -module -avoid-version
++prot_dht_la_LDFLAGS = -module -avoid-version -shared
+ prot_dht_la_SOURCES = prot_dht.c
+ prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+-prot_client_la_LDFLAGS = -module -avoid-version
++prot_client_la_LDFLAGS = -module -avoid-version -shared
+ prot_client_la_SOURCES = prot_client.c
+ prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+-prot_server_la_LDFLAGS = -module -avoid-version
++prot_server_la_LDFLAGS = -module -avoid-version -shared
+ prot_server_la_SOURCES = prot_server.c
+ prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
+--- a/xlators/features/qemu-block/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/qemu-block/src/Makefile.am 2015-08-28 11:03:19.464259458 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = qemu-block.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-qemu_block_la_LDFLAGS = -module -avoid-version
++qemu_block_la_LDFLAGS = -module -avoid-version -shared
+ qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt
+
+ qemu_block_la_SOURCES_qemu = \
+Only in b/xlators/features/qemu-block/src: Makefile.am.orig
+Only in b/xlators/features/qemu-block/src: Makefile.am.rej
+diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
+--- a/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = quiesce.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-quiesce_la_LDFLAGS = -module -avoid-version
++quiesce_la_LDFLAGS = -module -avoid-version -shared
+
+ quiesce_la_SOURCES = quiesce.c
+ quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am
+--- a/xlators/features/quota/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/quota/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,8 +1,8 @@
+ xlator_LTLIBRARIES = quota.la quotad.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+-quota_la_LDFLAGS = -module -avoid-version
+-quotad_la_LDFLAGS = -module -avoid-version
++quota_la_LDFLAGS = -module -avoid-version -shared
++quotad_la_LDFLAGS = -module -avoid-version -shared
+
+ quota_la_SOURCES = quota.c quota-enforcer-client.c
+ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
+--- a/xlators/features/read-only/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/features/read-only/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -4,12 +4,12 @@
+
+ noinst_HEADERS = read-only-common.h
+
+-read_only_la_LDFLAGS = -module -avoid-version
++read_only_la_LDFLAGS = -module -avoid-version -shared
+
+ read_only_la_SOURCES = read-only.c read-only-common.c
+ read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+-worm_la_LDFLAGS = -module -avoid-version
++worm_la_LDFLAGS = -module -avoid-version -shared
+
+ worm_la_SOURCES = read-only-common.c worm.c
+ worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+--- a/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = glusterd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
+ glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
+-glusterd_la_LDFLAGS = -module -avoid-version
++glusterd_la_LDFLAGS = -module -avoid-version -shared
+ if ENABLE_BD_XLATOR
+ glusterd_la_LDFLAGS += -llvm2app
+ endif
+diff -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
+--- a/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -26,7 +26,7 @@
+ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
+ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
+
+-fuse_la_LDFLAGS = -module -avoid-version
++fuse_la_LDFLAGS = -module -avoid-version -shared
+ fuse_la_LIBADD = @GF_FUSE_LDADD@
+
+ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+Only in b/xlators/mount/fuse/src: Makefile.am.orig
+diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
+--- a/xlators/nfs/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/nfs/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = server.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs
+ nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src
+-server_la_LDFLAGS = -module -avoid-version
++server_la_LDFLAGS = -module -avoid-version -shared
+ server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \
+ nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \
+ nlmcbk_svc.c mount3udp_svc.c acl3.c
+diff -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
+--- a/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = io-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-io_cache_la_LDFLAGS = -module -avoid-version
++io_cache_la_LDFLAGS = -module -avoid-version -shared
+
+ io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c
+ io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
+--- a/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = io-threads.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-io_threads_la_LDFLAGS = -module -avoid-version
++io_threads_la_LDFLAGS = -module -avoid-version -shared
+
+ io_threads_la_SOURCES = io-threads.c
+ io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
+--- a/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = md-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-md_cache_la_LDFLAGS = -module -avoid-version
++md_cache_la_LDFLAGS = -module -avoid-version -shared
+
+ md_cache_la_SOURCES = md-cache.c
+ md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
+--- a/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = open-behind.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-open_behind_la_LDFLAGS = -module -avoid-version
++open_behind_la_LDFLAGS = -module -avoid-version -shared
+
+ open_behind_la_SOURCES = open-behind.c
+ open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
+--- a/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = quick-read.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-quick_read_la_LDFLAGS = -module -avoid-version
++quick_read_la_LDFLAGS = -module -avoid-version -shared
+
+ quick_read_la_SOURCES = quick-read.c
+ quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
+--- a/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = read-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-read_ahead_la_LDFLAGS = -module -avoid-version
++read_ahead_la_LDFLAGS = -module -avoid-version -shared
+
+ read_ahead_la_SOURCES = read-ahead.c page.c
+ read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
+--- a/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = readdir-ahead.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-readdir_ahead_la_LDFLAGS = -module -avoid-version
++readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
+
+ readdir_ahead_la_SOURCES = readdir-ahead.c
+ readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
+--- a/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = symlink-cache.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance
+
+-symlink_cache_la_LDFLAGS = -module -avoid-version
++symlink_cache_la_LDFLAGS = -module -avoid-version -shared
+
+ symlink_cache_la_SOURCES = symlink-cache.c
+ symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
+--- a/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200
++++ b/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = write-behind.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
+
+-write_behind_la_LDFLAGS = -module -avoid-version
++write_behind_la_LDFLAGS = -module -avoid-version -shared
+
+ write_behind_la_SOURCES = write-behind.c
+ write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
+--- a/xlators/playground/template/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/playground/template/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = template.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
+
+-template_la_LDFLAGS = -module -avoid-version
++template_la_LDFLAGS = -module -avoid-version -shared
+
+ template_la_SOURCES = template.c
+ template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
+--- a/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ auth_LTLIBRARIES = addr.la
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
+
+-addr_la_LDFLAGS = -module -avoid-version
++addr_la_LDFLAGS = -module -avoid-version -shared
+
+ addr_la_SOURCES = addr.c
+ addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
+--- a/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ auth_LTLIBRARIES = login.la
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
+
+-login_la_LDFLAGS = -module -avoid-version
++login_la_LDFLAGS = -module -avoid-version -shared
+
+ login_la_SOURCES = login.c
+ login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+diff -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
+--- a/xlators/protocol/client/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/client/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = client.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+
+-client_la_LDFLAGS = -module -avoid-version
++client_la_LDFLAGS = -module -avoid-version -shared
+
+ client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+diff -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
+--- a/xlators/protocol/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200
++++ b/xlators/protocol/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,7 +1,7 @@
+ xlator_LTLIBRARIES = server.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
+
+-server_la_LDFLAGS = -module -avoid-version
++server_la_LDFLAGS = -module -avoid-version -shared
+
+ server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+diff -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
+--- a/xlators/storage/bd/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/storage/bd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = bd.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+
+-bd_la_LDFLAGS = -module -avoid-version
++bd_la_LDFLAGS = -module -avoid-version -shared
+ LIBBD = -llvm2app -lrt
+ bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
+ bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
+diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
+--- a/xlators/storage/posix/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/storage/posix/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -2,7 +2,7 @@
+ xlator_LTLIBRARIES = posix.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
+
+-posix_la_LDFLAGS = -module -avoid-version
++posix_la_LDFLAGS = -module -avoid-version -shared
+
+ posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c
+ posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO)
+diff -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
+--- a/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200
++++ b/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200
+@@ -1,6 +1,6 @@
+ xlator_LTLIBRARIES = posix-acl.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system
+-posix_acl_la_LDFLAGS = -module -avoid-version
++posix_acl_la_LDFLAGS = -module -avoid-version -shared
+ posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c
+ posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild
deleted file mode 100644
index ffd564e4b2b9..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-inherit autotools elisp-common eutils multilib python versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-RDEPEND="emacs? ( virtual/emacs )
- fuse? ( >=sys-fs/fuse-2.7.0 )
- infiniband? ( sys-infiniband/libibverbs )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/bison
- sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
- "${FILESDIR}/${PN}-docdir.patch" \
- "${FILESDIR}/glusterd-3.2.0-workdir.patch"
- sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable fuse fuse-client) \
- $(use_enable infiniband ibverbs) \
- $(use_enable static-libs static) \
- --enable-georeplication \
- --disable-bdb \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var
-}
-
-src_compile() {
- emake
- if use emacs ; then
- elisp-compile extras/glusterfs-mode.el || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if use emacs ; then
- elisp-install ${PN} extras/glusterfs-mode.el* || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim"
- insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim
- fi
-
- if use extras ; then
- newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize
- newbin extras/backend-cleanup.sh glusterfs-backend-cleanup
- newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute
- newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync
- fi
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-
- newinitd "${FILESDIR}/${PN}.initd" glusterfsd
- newinitd "${FILESDIR}/glusterd.initd" glusterd
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
- keepdir /var/log/${PN}
- keepdir /var/lib/glusterd
-
- python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
- elog " /etc/init.d/glusterd start"
- elog
- elog "For static configurations, the glusterfsd startup script can be multiplexed."
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
- elog "separate service. To create additional instances of the glusterfsd service"
- elog "simply create a symlink to the glusterfsd startup script."
- elog
- elog "Example:"
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
- elog "You can now treat glusterfsd2 like any other service"
- elog
- ewarn "You need to use a ntp client to keep the clocks synchronized across all"
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
- ewarn "run GlusterFS."
-
- if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then
- elog
- elog "You are upgrading from a previous version of ${PN}, please read:"
- elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide"
- fi
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
deleted file mode 100644
index fd8b7dd11614..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-RDEPEND="emacs? ( virtual/emacs )
- fuse? ( >=sys-fs/fuse-2.7.0 )
- infiniband? ( sys-infiniband/libibverbs )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/bison
- sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.3.0-parallel-build.patch"
- "${FILESDIR}/${PN}-3.3.0-docdir.patch"
- "${FILESDIR}/${PN}-3.3.0-silent_rules.patch"
- "${FILESDIR}/${PN}-3.3.0-avoid-version.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- sed -e "s/ -ggdb3//g" \
- -i argp-standalone/configure.ac || die
- sed -e "s:\$(PYTHON):${PREFIX}/usr/bin/python2:g" \
- -i xlators/features/marker/utils/src/Makefile.am || die #446330
- sed -e 's:"/usr/local/libexec/glusterfs:GSYNCD_PREFIX":' \
- -i xlators/mgmt/glusterd/src/glusterd.c || die #464196
- autotools-utils_src_prepare
- cd argp-standalone && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-dependency-tracking
- --disable-silent-rules
- $(use_enable fuse fuse-client)
- $(use_enable infiniband ibverbs)
- $(use_enable static-libs static)
- --enable-georeplication
- --docdir=/usr/share/doc/${PF}
- --localstatedir=/var
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- if use emacs ; then
- elisp-compile extras/glusterfs-mode.el || die
- fi
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use emacs ; then
- elisp-install ${PN} extras/glusterfs-mode.el* || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
- insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
- fi
-
- if use extras ; then
- newbin extras/backend-xattr-sanitize.sh ${PN}-backend-xattr-sanitize
- newbin extras/backend-cleanup.sh ${PN}-backend-cleanup
- newbin extras/migrate-unify-to-distribute.sh ${PN}-migrate-unify-to-distribute
- newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
- fi
-
- newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
- newinitd "${FILESDIR}/glusterd.initd" glusterd
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
- keepdir /var/log/${PN}
- keepdir /var/lib/glusterd
-
- python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
- elog " /etc/init.d/glusterd start"
- elog
- elog "For static configurations, the glusterfsd startup script can be multiplexed."
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
- elog "separate service. To create additional instances of the glusterfsd service"
- elog "simply create a symlink to the glusterfsd startup script."
- elog
- elog "Example:"
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
- elog "You can now treat glusterfsd2 like any other service"
- elog
- ewarn "You need to use a ntp client to keep the clocks synchronized across all"
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
- ewarn "run GlusterFS."
-
- elog
- elog "You are upgrading from a previous version of ${PN}, please read:"
- elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/"
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
similarity index 96%
rename from sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
rename to sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
index e818b4129403..ad162ac94735 100644
--- a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
@@ -57,6 +57,14 @@ pkg_setup() {
( use georeplication || use glupy ) && python-single-r1_pkg_setup
}
+src_prepare() {
+ autotools-utils_src_prepare
+
+ # argp-standalone source dir is not clean...
+ cd argp-standalone
+ emake distclean
+}
+
src_configure() {
local myeconfargs=(
--disable-dependency-tracking
@@ -139,6 +147,7 @@ src_install() {
# QA
rm -rf "${ED}/var/run/" || die
+ use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
use georeplication && python_fix_shebang "${ED}"
}
diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
new file mode 100644
index 000000000000..5015ae8d54af
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="http://www.gluster.org/"
+SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+ glupy? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+ emacs? ( virtual/emacs )
+ fuse? ( >=sys-fs/fuse-2.7.0 )
+ georeplication? ( ${PYTHON_DEPS} )
+ infiniband? ( sys-infiniband/libibverbs:* sys-infiniband/librdmacm:* )
+ qemu-block? ( dev-libs/glib:2 )
+ systemtap? ( dev-util/systemtap )
+ xml? ( dev-libs/libxml2 )
+ sys-libs/readline:=
+ dev-libs/libaio
+ dev-libs/openssl:=
+ || ( sys-libs/glibc sys-libs/argp-standalone )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/bison
+ sys-devel/flex"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
+ "${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
+ "${FILESDIR}/${PN}-3.6.5-build-shared-only.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+# if the argp.h header is found in the system. Which should be the case with
+# glibc or if argp-standalone is installed.
+
+pkg_setup() {
+ ( use georeplication || use glupy ) && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ autotools-utils_src_prepare
+
+ # contrib/argp-standalone source dir is not clean...
+ cd contrib/argp-standalone
+ emake distclean
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --disable-silent-rules
+ --disable-fusermount
+ $(use_enable debug)
+ $(use_enable bd-xlator)
+ $(use_enable crypt-xlator)
+ $(use_enable fuse fuse-client)
+ $(use_enable georeplication)
+ $(use_enable glupy)
+ $(use_enable infiniband ibverbs)
+ $(use_enable qemu-block)
+ $(use_enable static-libs static)
+ $(use_enable syslog)
+ $(use_enable systemtap)
+ $(use_enable xml xml-output)
+ --docdir=/usr/share/doc/${PF}
+ --localstatedir=/var
+ )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ rm \
+ "${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+ "${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
+ "${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+ if use rsyslog ; then
+ insinto /etc/rsyslog.d
+ newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+ fi
+
+ if use emacs ; then
+ elisp-install ${PN} extras/glusterfs-mode.el*
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+ insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+ fi
+
+ # insert some other tools which might be useful
+ insinto /usr/share/glusterfs/scripts
+ doins \
+ extras/backend-{cleanup,xattr-sanitize}.sh \
+ extras/clear_xattrs.sh \
+ extras/migrate-unify-to-distribute.sh
+
+ # correct permissions on installed scripts
+ # fperms 0755 /usr/share/glusterfs/scripts/*.sh
+ chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+ if use georeplication ; then
+ # move the gsync-sync-gfid tool to a binary path
+ # and set a symlink to be compliant with all other distros
+ mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+ dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+ fi
+
+ newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+ newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
+ newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+ keepdir /var/log/${PN}
+ keepdir /var/lib/glusterd
+
+ # QA
+ rm -rf "${ED}/var/run/" || die
+ use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
+
+ use georeplication && python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+ elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+ elog " /etc/init.d/glusterd start"
+ echo
+ elog "For static configurations, the glusterfsd startup script can be multiplexed."
+ elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+ elog "separate service. To create additional instances of the glusterfsd service"
+ elog "simply create a symlink to the glusterfsd startup script."
+ echo
+ elog "Example:"
+ elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
+ elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+ elog "You can now treat glusterfsd2 like any other service"
+ echo
+ ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+ ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+ ewarn "run GlusterFS."
+
+ elog
+ elog "If you are upgrading from a previous version of ${PN}, please read:"
+ elog " http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5"
+
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 5ff4d7790ab5..0baea82548dc 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -8,6 +8,6 @@ DIST binutils-2.24-patches-1.4.tar.xz 17488 SHA256 f018f140a52cddb1e4619b5caf4b4
DIST binutils-2.24.tar.bz2 22716802 SHA256 e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 SHA512 5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12 WHIRLPOOL 619634dfdc73b8f6e9933b4642f5f9faf147c388a6d39283cd7639d83f3d7a601981cf49a787c43c17a942c563f24dc8dcc682138b5d3102a5650e1b9d15bd50
DIST binutils-2.25-patches-1.1.tar.xz 11440 SHA256 fb357d6a6fcb348584f30236c5c541d946496472c6bbd45e72d2a60e1182fbce SHA512 a236973ebfd72a069fbb578206baef0d35e12fe7fd19dd5a8fe002088db86d15b149b3de3dfc88a7e58c39df1c354a1caf3e20efc757c080301fa29d083020d3 WHIRLPOOL 03f6f7217c38c856f475cbb561e538d6a8a4368f420295b914fa77d1fc8e05bb96e6678fcd5100290be5d3ab3859182e901387d8ff58014acee0e2a957e27e34
DIST binutils-2.25-patches-1.2.tar.xz 16480 SHA256 c5a65aefaf561e592961d22cf88e57dd304a73d3643581414b5a7c14667eef30 SHA512 5a8072c57ce393a50de8770885d6740b8835d656e357a12caf67c4ffbfce228f9a53ea0861199a1a08e2ca724702d0e013f3a9787b15de21178e99263fc43292 WHIRLPOOL 691cf14bfb2c1bb144db29917dea791c18eeb192f61325ef3265fed6c4ad870e23485c3505f74a688158bf862d6539aa5f036400dcf14b9c05a09327ab871133
-DIST binutils-2.25.1-patches-1.0.tar.xz 16472 SHA256 51ae9e098d7cfd0ae6db4971939062d4051077b1d743263f2d4c621591303e14 SHA512 1743969d531d18e5d458a165f1b05b3c3253b062a8908b722e11ed82144598eef0983d8e1bb4f132ad80b534a0d6b37cc2ffa0575e1ec303219d1e43d5f30f26 WHIRLPOOL 1afcde32383213cce48116dc5161da535372d9104acfb9b3b893859f58800d0833dc3d041492250e4ec9d981a98c2af4fa9f07aba3ca1f1770d334199bf34855
+DIST binutils-2.25.1-patches-1.1.tar.xz 18724 SHA256 3d4c0ab2d45d3a952f60246fa5a4353f057c03110130b50e3b2103bd49c345fa SHA512 209c55bf26b51d8c513b40abd2d95f687159c4e964a6c732924f277d04c97323c427fe452c63d5ec6962dcd8892d6d5d807ba88826739425bce6812a31f573dd WHIRLPOOL 2b650af352183d2b58abaee955b223606d63bd5f22a73360e79af1d3b575c5ea385f90be92348ec850534d96f7b6632b1e494f314ec1655eedc26108e849aab7
DIST binutils-2.25.1.tar.bz2 24163561 SHA256 b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 SHA512 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d WHIRLPOOL daa804331ee880296c2fe29fd9b8a52cc695629d4bbe0b9889d96ffc54d330f00fac3f3cb12b3aaf6b7505521ef499c53760912cd7c9bb54f2d5e288224bd1eb
DIST binutils-2.25.tar.bz2 24049133 SHA256 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 SHA512 49438970642f379978aba988e3d2e7b63dab6fd0b46d91f4100f083e87a84d242089daca58572245fe620457a77bbbe2d78588ff3fb79314e500d1a39bf96f30 WHIRLPOOL 92f963d6ffe7d2378726cb080e893f8c58c8b6de030e78da488d8c3fd157e064a90b62d9bd2f305707758aa016a9e48f0953425828a2a0432ddee8ffae89585f
diff --git a/sys-devel/binutils/binutils-2.25.1.ebuild b/sys-devel/binutils/binutils-2.25.1-r1.ebuild
similarity index 95%
rename from sys-devel/binutils/binutils-2.25.1.ebuild
rename to sys-devel/binutils/binutils-2.25.1-r1.ebuild
index 57c5fa6f8060..7834524dd1c5 100644
--- a/sys-devel/binutils/binutils-2.25.1.ebuild
+++ b/sys-devel/binutils/binutils-2.25.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-PATCHVER="1.0"
+PATCHVER="1.1"
ELF2FLT_VER=""
inherit toolchain-binutils
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 511fe92cd6a9..1be2a1d1d841 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,19 +1,6 @@
-DIST gdb-7.5-patches-1.tar.xz 9208 SHA256 07d2e5cd96c3acf64710d3cd1098684aa7db7e9e448b5a49775650c2abcb9daf SHA512 775c4b5953e7f02a0bfdc1801fa220e3446bf5cc2153e49cbba7dc883740e64604fde1bd04b6916f47530c94ab6a5351e4d4151a5b1f6f3f3d15f42e9210c196 WHIRLPOOL 69d4079327dce6e8fa8522c155b1a55687a1e14949d6812700512efcc99b51bb1a2becb4c0562b0b5bbc2ee87718d89ea278fa7f7166fa8c88b346cd5968f636
-DIST gdb-7.5.1-patches-2.tar.xz 8720 SHA256 7b93f737eb90c981685b6eab8ab7cda7ee0a3637b0110450efa5900486cca9dc SHA512 ab04daff6c83738fb7dc96f3444d8b6ab0bc52dd380ee6079676ba9507201c4e19bf8a8dd092705c968e4109d0080216020ad4a03c963b15cd37c6da3e8804ac WHIRLPOOL 8c520dbfb3288ff19a8978f2c1e7687467e2362fa0385d1f62beb1b2081264b597b4ca45b16d0d658cfba7bd754e10f219d84bedcb8acd0c2be4d5c64b201aca
-DIST gdb-7.5.1.tar.bz2 21349391 SHA256 070b808d289fa8f0291738eeaccc0cd7700d476998781f572856155240d29d20 SHA512 23b240f0ca9376dfc2fdeb79e725a3784841d1f787db9f7ca62a5e2f824ddd8b2d5fb3450e19dd8fee79589e3b0a5fe638eaa35966363c78c82711731c26dc47 WHIRLPOOL b1bb3d5133efcdd3e842ba03bf2f8ebcd01f4cbda8333a6725cd4160604b592fb991c02c17b725ffbcea0b7e37de9ade380079d903541124b4b76fcbd5f9e754
-DIST gdb-7.5.tar.bz2 21327195 SHA256 d178c45c328369ae4f24f9a0ec53b7d009e2bfa1d41b7027280b24f58ae61932 SHA512 fcedba8a8ba50470e8c032801e99a43dae7fcaf7885b55beaf2d47bfb7b0b666cb5e3bb40d0b67e9a3ba50bd88faba0a255474ab38c2a0272e880d5c668e0506 WHIRLPOOL fa2d238380508cfe8c1ca9a0906e87d539b0470230da407c5c6a02cd9f2b63c727586a9651943ee9328bb44d782a66bb9fae7dd27e9bd31fd5cbd0161cc3514d
-DIST gdb-7.6-patches-3.tar.xz 13644 SHA256 5ec83531a6bab75d9e3a67431d724b936cadb06862810b3182ac13f8d9b0cd22 SHA512 23a6e597629ecc544f8646eda5a637752b04cb5ecb7797f88d342e0c38f0680419a3656d8718722e8eeb7165e9aa7696c2e5b889049e5b405415bb7c391fa350 WHIRLPOOL 5a9f5cc513768c3218353ee74605ae224d556a72b557763370cc059e75fc31d438b57521df2e9d8eb5d713bbfb8d308d6b2cdf7dbdb7838343b12afc9d81e619
-DIST gdb-7.6.1-patches-2.tar.xz 14136 SHA256 327948403616d1376cca2bfb0ff174b93bf0494390708864ef54bdd98bc4729f SHA512 f1364d5cc70ea3c131e48ec5cc7275bcf0f875b0dcbe663f507b0f5d082e7db38636fd9036db3da7b2e9794dbc7d42b24126d91fde9447f6f10fcc8b3aea7817 WHIRLPOOL aa738854e26da8469ae98fb681552a7f25777809027761bb788a42db73bfd7852a09e82a8bacb2870ffc52a5953bc398adc4e098c6d36f331cd23a9a9a75c6ed
-DIST gdb-7.6.1.tar.bz2 24338919 SHA256 e3dfa38a14a5457f9b8b26f7b5080ba5491bd10ae4d69bfe357cea87b7d162e4 SHA512 ca42f003073d35cde42b43efe12f42888b39f2fc4b55f7df9faca2c8381a9329f19bf9366fff0af3ae59711aafaf9b4a33a15cb73a531c0c046b8ada98ed774b WHIRLPOOL 0489854f52e5d3e8fa36f4deb629e9aa7e83fd0ce80fe9aef6a9284e348e52e5d71e655d403a856911b868891ee2ba07bacc707326ef68d68052b557d5aef963
DIST gdb-7.6.2-patches-1.tar.xz 14136 SHA256 aeb45e64c4d1f70cf97cd89e66dfe72d219b140e583f602720f29b5fa6ea5145 SHA512 d56e8a613ca0f33ebe203aa85a39881b10a0a15c56ea51c7633b6f032628e207d31d1adfc8f0b7e83754da729baead0acbc83893f1d480c41ce02cad38b6b4ff WHIRLPOOL e9f5482619653c54ad95f4c9eb5310320345ef3b825e373b629b320b9d11f6acfe88e5d713faf98927da77f05d5a37edef61bfce09a4a3990c20135945930a2c
DIST gdb-7.6.2.tar.bz2 24269334 SHA256 2f6a0e2ce1c66c9dedeb7f58a8d1298ad602ddcdaf15d23104e1f7832b96d0e8 SHA512 e72e9c2abb58cc08c38841380270fe783f26baf62798171d21cf0843e6c9a81d285f424dc6229ea7b1c6c957d999c8aa75c2bd15076817abb9caab28c4eb7666 WHIRLPOOL bff0c9b33401b5efdf9c87408b4e4ee635509b536f371b4104895844a86256451d684412d0fab6dfb8e5ea2108ac2e4e383a33f2966ed2a32c4dbbbf54a280f4
-DIST gdb-7.6.tar.bz2 24333590 SHA256 a410e8f35ee70cce83dbbf1da9e2a8373f271ac0e4b71db4336ae293fc7bdf1b SHA512 3b4f7f25ab8a8014a339966fd165dac6ac63df7d6403c338bbd38737bc0033d7e6461cdea2cd6dd095335a9d2a0ecd9d694e862b8d54d269dae577402e2b3ffe WHIRLPOOL c519955a9b6246e90b979783e5745e49de36b6fcd5b17360ae8db92283efb63117a592a03b92e173a11f986dfcc587e2d5c26f3aea49634f317f554ffe2f0e72
-DIST gdb-7.7-patches-1.tar.xz 9368 SHA256 89fd4da18dec37773121d8f0cb5403c7edb1b9ad81ccaa5bcf9cfc389e60ed83 SHA512 1afac04f426e8bda4def8694bf9aee7783a55681c06c823527ae6c2b9237fc9a20d4854a1fc2452b4c72bd8eb0e7b991d66167bbad76bb36334bda76d6d7d5d1 WHIRLPOOL 93766c32540223e81b54573aede9cd7995a28f80d2ded70fac519c310b3a9e7413028942d3a70bcd3ea831e4ee2c00da8547def64accf890b651d89c712068ce
DIST gdb-7.7.1-patches-1.tar.xz 8600 SHA256 336cdcb2c90da0ca970dc21dc0285a8cb1fbcf81af63c49ee3f3d45c0aef7200 SHA512 427aba554e77ccfe9cdf5b0a833a1d64f1882e8f9e37d1288c5f2510cc63d154b4c22054a2a653d156e37044d7655937dee4a1a9cd0f9768abaafc8c34ae1cc0 WHIRLPOOL d5db4b874475724ac62bae9f1b33c566192570dd68195fe1c2065b7502a36b06f5a64079a88c63a965392d87e9b7a8eb0c709578297d6692fdce1ee933a867f4
DIST gdb-7.7.1.tar.bz2 24849503 SHA256 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5 SHA512 887b9b726dae8f6e3e5e41574460a67e4f9002b0d47bc985dcf63bdf3518397a90b6a208cb5b19e5ed2341715ad75cfeed4df4fb423f39f74218e36bc87f1cab WHIRLPOOL 3b726d5f519167105248eb3a400be0d9bc70f72dbce9a04aa56a765b6c2ed9fc00a7c2e6ec72d0372f87bada1d74a40fc998c10a5322e2f3b5c8ea53c7ba6aa4
-DIST gdb-7.7.tar.bz2 24846320 SHA256 0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23 SHA512 42c8d312c0ca1042d1df7e115c541abc7453c20813b3f4f1fe52c62bc04b85d9116539d245e6404fa556260ba13f78f9a2ac35424eb7fd8ef9954cdbfc9581e0 WHIRLPOOL 8f1610e7f2023a5f273c15cdca6da40e22527d61f694e841c55c696d14e55d6abc3aa4144ffb995fe78448e69c50ea7ac9854aaab1ef2e2b8d551b975d35e8b7
-DIST gdb-7.8.1.tar.xz 17669136 SHA256 497722b58386f4428c3474281eb3ef1c872404998b6ace907edb3bba1fabdc35 SHA512 c40775e727a665300b45ec5d375424565671768cb73eee6793285a5b9a29db66072fc55d56bc1b4189cd38e0590573554e283661e4fbec23e4ad3d5b90542a87 WHIRLPOOL 845988be5a667eae2ca2f433399d51af3bf8219a692385477f6f7f37bae000a017f39db271f28cf101a0b92eb4b48fe79c7edd1da1b84a83f3a612e49b96e265
DIST gdb-7.8.2.tar.xz 17678568 SHA256 605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485 SHA512 face5bf1b4ce144fc8604fc84620beed956177a11fd632b4e41906fc7f632910b2b43a50e6cfdfd6cbd876ee527c813bddab8df29dc560a6c36694cdb8edc4e4 WHIRLPOOL b0e5adc8e98c8363c25b86a8f47d07863a97f215c74b4fe2fcce4e72ce82867bafea60cb51d26f3814e895a93e047ca962b19fb2557e9c74a0ab3d88b1e6ee1d
-DIST gdb-7.8.tar.xz 17664316 SHA256 49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875 SHA512 e3977393c3a9bc2860d845928f457f4696a87106ccf30569cb69a82893deeab9b05fd1cffa4316cc5cfdfd3ad11a2d5660ed07a9965fa3d696a0ec604702557f WHIRLPOOL fb97f1fbee170fccf462d25fd6b4a218a8126b75465b59e21322ff2cacf2707d6b037d593663a4f52ae293c72d012a69a65377ee6827de18da80159c829b672d
DIST gdb-7.9.1.tar.xz 17867692 SHA256 cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 WHIRLPOOL fe7afb392f453fa5aab290da3b74118c4e3bbae6f4e276f2efd7f978e3987e031d92ecd90d35e0531901f1cf68b04a313df050b25bb3b632d1b6e62360acd591
-DIST gdb-7.9.tar.xz 17859428 SHA256 9b315651a16528f7af8c7d8284699fb0c965df316cc7339bb0b7bae335848392 SHA512 850202a477b486a75dc8196efead79c95bc675e348064a5eefee2a50215d40f62e9e052e9b8df29f997f91430f6e7454883652c701f5b1e688d9e2c575876c83 WHIRLPOOL 597cbe8b8c9da7e2188f6d207738fd9679c3a841fec9483f67ff91156d7886636b1da61bf1255155115655d87648278a0670ad381afde931c7c6ab6e762a9ecd
diff --git a/sys-devel/gdb/gdb-7.5.1.ebuild b/sys-devel/gdb/gdb-7.5.1.ebuild
deleted file mode 100644
index e1d16e7b1c39..000000000000
--- a/sys-devel/gdb/gdb-7.5.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic eutils
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.bz2"
- ;;
-esac
-
-PATCH_VER="2"
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat multitarget nls +python +server test vanilla zlib"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2
- sys-libs/readline
- expat? ( dev-libs/expat )
- python? ( =dev-lang/python-2* )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local sysroot="${EPREFIX}"/usr/${CTARGET}
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- $(is_cross && echo \
- --with-sysroot="${sysroot}" \
- --includedir="${sysroot}/usr/include")
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPREFIX}/usr/bin/python2")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- emake DESTDIR="${D}" install || die
- use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
-
- dodoc README
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.5.ebuild b/sys-devel/gdb/gdb-7.5.ebuild
deleted file mode 100644
index f0d9a5745afd..000000000000
--- a/sys-devel/gdb/gdb-7.5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic eutils
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.bz2"
- ;;
-esac
-
-PATCH_VER="1"
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat multitarget nls +python +server test vanilla zlib"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2
- sys-libs/readline
- expat? ( dev-libs/expat )
- python? ( =dev-lang/python-2* )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local sysroot="${EPREFIX}"/usr/${CTARGET}
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- $(is_cross && echo \
- --with-sysroot="${sysroot}" \
- --includedir="${sysroot}/usr/include")
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPREFIX}/usr/bin/python2")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- emake DESTDIR="${D}" install || die
- use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
-
- dodoc README
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.6.1.ebuild b/sys-devel/gdb/gdb-7.6.1.ebuild
deleted file mode 100644
index 3df6b725b8e4..000000000000
--- a/sys-devel/gdb/gdb-7.6.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic eutils
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.bz2"
- ;;
-esac
-
-PATCH_VER="2"
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2
- sys-libs/readline
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( =dev-lang/python-2* )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- strip-linguas -u bfd/po opcodes/po
- if [[ ${CHOST} == *-darwin* ]] ; then
- # make sure we have a python-config that matches our install,
- # such that the python check doesn't fail just because the
- # gdb-provided copy isn't quite what our python installed
- # version is
- rm -f "${S}"/gdb/python/python-config.py || die
- pushd "${S}"/gdb/python > /dev/null || die
- ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \
- python-config.py || die
- popd > /dev/null || die
- fi
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPREFIX}/usr/bin/python2")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- emake DESTDIR="${D}" install || die
- use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
-
- dodoc README
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.6.ebuild b/sys-devel/gdb/gdb-7.6.ebuild
deleted file mode 100644
index b28258fc0a06..000000000000
--- a/sys-devel/gdb/gdb-7.6.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit flag-o-matic eutils
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.bz2"
- ;;
-esac
-
-PATCH_VER="3"
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2
- sys-libs/readline
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( =dev-lang/python-2* )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPREFIX}/usr/bin/python2")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- emake DESTDIR="${D}" install || die
- use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
-
- dodoc README
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.7-r1.ebuild b/sys-devel/gdb/gdb-7.7-r1.ebuild
deleted file mode 100644
index 88d55997053a..000000000000
--- a/sys-devel/gdb/gdb-7.7-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.bz2"
- ;;
-esac
-
-PATCH_VER="1"
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2:0=
- sys-libs/readline:0=
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- epatch_user
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{binutils,etc,gas,gold,gprof,ld}
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- # This only disables building in the readline subdir.
- # For gdb itself, it'll use the system version.
- --disable-readline
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPYTHON}")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- default
- use client && find "${ED}"/usr -name libiberty.a -delete
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.7.1.ebuild b/sys-devel/gdb/gdb-7.7.1.ebuild
index fae8ad77794d..91d846221bc0 100644
--- a/sys-devel/gdb/gdb-7.7.1.ebuild
+++ b/sys-devel/gdb/gdb-7.7.1.ebuild
@@ -43,7 +43,7 @@ SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.x
LICENSE="GPL-2 LGPL-2"
SLOT="0"
if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-devel/gdb/gdb-7.8.1.ebuild b/sys-devel/gdb/gdb-7.8.1.ebuild
deleted file mode 100644
index 4c8d29520c4e..000000000000
--- a/sys-devel/gdb/gdb-7.8.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.xz
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
- ;;
-esac
-
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- || ( client server )
-"
-
-RDEPEND="server? ( !dev-util/gdbserver )
- client? (
- >=sys-libs/ncurses-5.2-r2:0=
- sys-libs/readline:0=
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )
- )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- client? (
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )
- )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- epatch_user
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{binutils,etc,gas,gold,gprof,ld}
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- --with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- # This only disables building in the readline subdir.
- # For gdb itself, it'll use the system version.
- --disable-readline
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPYTHON}")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- default
- use client && find "${ED}"/usr -name libiberty.a -delete
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share/{doc,info,locale}
- local f
- for f in "${ED}"/usr/share/man/*/* ; do
- if [[ ${f##*/} != ${CTARGET}-* ]] ; then
- mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
- fi
- done
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.8.ebuild b/sys-devel/gdb/gdb-7.8.ebuild
deleted file mode 100644
index 1174ed8e19c6..000000000000
--- a/sys-devel/gdb/gdb-7.8.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.xz
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
- ;;
-esac
-
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2:0=
- sys-libs/readline:0=
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- epatch_user
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{binutils,etc,gas,gold,gprof,ld}
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- --with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- # This only disables building in the readline subdir.
- # For gdb itself, it'll use the system version.
- --disable-readline
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPYTHON}")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- default
- use client && find "${ED}"/usr -name libiberty.a -delete
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share/{doc,info,locale}
- local f
- for f in "${ED}"/usr/share/man/*/* ; do
- if [[ ${f##*/} != ${CTARGET}-* ]] ; then
- mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
- fi
- done
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/gdb-7.9.ebuild b/sys-devel/gdb/gdb-7.9.ebuild
deleted file mode 100644
index 909d323097fb..000000000000
--- a/sys-devel/gdb/gdb-7.9.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*.*.50.2???????)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
- ;;
-*.*.*.*.*.*)
- # fedora versions; note we swap the rpm & fedora core versions.
- # gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
- # gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
- inherit versionator rpm
- gvcr() { get_version_component_range "$@"; }
- parse_fedora_ver() {
- set -- $(get_version_components)
- MY_PV=$(gvcr 1-$(( $# - 2 )))
- RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
- }
- parse_fedora_ver
- SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.xz
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
- ;;
-esac
-
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- || ( client server )
-"
-
-RDEPEND="server? ( !dev-util/gdbserver )
- client? (
- >=sys-libs/ncurses-5.2-r2:0=
- sys-libs/readline:0=
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )
- )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- client? (
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )
- )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- epatch_user
- strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='https://bugs.gentoo.org/'
- --disable-werror
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{binutils,etc,gas,gold,gprof,ld}
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- --with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- # This only disables building in the readline subdir.
- # For gdb itself, it'll use the system version.
- --disable-readline
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPYTHON}")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- default
- use client && find "${ED}"/usr -name libiberty.a -delete
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share/{doc,info,locale}
- local f
- for f in "${ED}"/usr/share/man/*/* ; do
- if [[ ${f##*/} != ${CTARGET}-* ]] ; then
- mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
- fi
- done
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-libs/libudev-compat/Manifest b/sys-libs/libudev-compat/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/sys-libs/libudev-compat/files/udev_old.c b/sys-libs/libudev-compat/files/udev_old.c
new file mode 100644
index 000000000000..584644ad0064
--- /dev/null
+++ b/sys-libs/libudev-compat/files/udev_old.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015 Jonathan Callen
+ * Copyright (C) 2008-2010 Kay Sievers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ */
+
+#include
+#include
+
+void *udev_monitor_new_from_socket(void *udev, const void *path) {
+ errno = ENOSYS;
+ return NULL;
+}
+
+void *udev_queue_get_failed_list_entry(void *udev_queue) {
+ errno = ENOSYS;
+ return NULL;
+}
+
+const char *udev_get_sys_path(void *udev) {
+ if (!udev) return NULL;
+ return "/sys";
+}
+
+const char *udev_get_dev_path(void *udev) {
+ if (!udev) return NULL;
+ return "/dev";
+}
+
+const char *udev_get_run_path(void *udev) {
+ if (!udev) return NULL;
+ return "/run/udev";
+}
diff --git a/sys-libs/libudev-compat/libudev-compat-186.ebuild b/sys-libs/libudev-compat/libudev-compat-186.ebuild
new file mode 100644
index 000000000000..3a725c6eb3ed
--- /dev/null
+++ b/sys-libs/libudev-compat/libudev-compat-186.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="Wrapper around libudev.so.1 for packages needing the old libudev.so.0"
+HOMEPAGE="http://gentoo.org/"
+SRC_URI=""
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="virtual/libudev:0/1[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ mkdir "${S}" || die
+ cp "${FILESDIR}"/udev_old.c "${S}" || die
+}
+
+multilib_src_configure() { :; }
+
+echo_and_run() {
+ echo "$@"
+ "$@"
+}
+
+multilib_src_compile() {
+ # Note: --no-as-needed is used explictly here to ensure that libudev.so.1
+ # is pulled in, even though nothing in udev_old.c otherwise requires it
+ echo_and_run $(tc-getCC) \
+ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+ -fpic -shared \
+ -Wl,-soname,libudev.so.0 \
+ -o libudev.so.0 \
+ "${S}"/udev_old.c \
+ -Wl,--no-as-needed \
+ -ludev || die
+}
+
+multilib_src_install() {
+ dolib.so libudev.so.0
+}
diff --git a/games-emulation/handy/metadata.xml b/sys-libs/libudev-compat/metadata.xml
similarity index 59%
rename from games-emulation/handy/metadata.xml
rename to sys-libs/libudev-compat/metadata.xml
index d3c2cc926f0b..311eca758a15 100644
--- a/games-emulation/handy/metadata.xml
+++ b/sys-libs/libudev-compat/metadata.xml
@@ -1,5 +1,8 @@
-games
+
+ jcallen@gentoo.org
+ Jonathan Callen
+
diff --git a/sys-libs/ncurses/ncurses-5.9-r99.ebuild b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
index 95611e9010c6..49dd18fd71b4 100644
--- a/sys-libs/ncurses/ncurses-5.9-r99.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
@@ -7,6 +7,8 @@
EAPI="5"
+inherit multilib-build
+
DESCRIPTION="transitional package"
HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
@@ -15,4 +17,4 @@ SLOT="5/5"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="ada +cxx gpm static-libs tinfo unicode"
-RDEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?]"
+RDEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
new file mode 100644
index 000000000000..a8b1c1e68640
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+ !<=sys-libs/ncurses-5.9-r4:5
+ !/dev/null)
+ local basedir=$(basename $(dirname "${termfile}"))
+
+ if [[ -n ${termfile} ]] ; then
+ dodir /etc/terminfo/${basedir}
+ mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
+ dosym ../../../../etc/terminfo/${basedir}/${x} \
+ /usr/share/terminfo/${basedir}/${x}
+ fi
+ done
+# fi
+
+ echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+ doenvd "${T}"/50ncurses
+
+ use minimal && rm -r "${ED}"/usr/share/terminfo*
+ # Because ncurses5-config --terminfo returns the directory we keep it
+ keepdir /usr/share/terminfo #245374
+
+ cd "${S}"
+ dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+ use doc && dohtml -r doc/html/
+}
+
+pkg_preinst() {
+ preserve_old_lib /$(get_libdir)/libncurses.so.5
+ use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+ preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+ use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
index a8b1c1e68640..3a9d218774c5 100644
--- a/sys-libs/ncurses/ncurses-6.0.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0.ebuild
@@ -2,271 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Bridge the old SLOT=5[/6] ebuild to the new SLOT=0/6 since the slotmove
+# functionality does not handle implicit subslots correctly. #558856
+
EAPI="5"
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
+inherit multilib-build
-MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="console display library"
+DESCRIPTION="transitional package"
HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
-LICENSE="MIT"
-# The subslot reflects the SONAME.
-SLOT="0/6"
+LICENSE="metapackage"
+SLOT="5/6"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
-
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
-# berkdb? ( sys-libs/db )"
-# Block the older ncurses that installed all files w/SLOT=5. #557472
-RDEPEND="${DEPEND}
- !<=sys-libs/ncurses-5.9-r4:5
- !/dev/null)
- local basedir=$(basename $(dirname "${termfile}"))
-
- if [[ -n ${termfile} ]] ; then
- dodir /etc/terminfo/${basedir}
- mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
- dosym ../../../../etc/terminfo/${basedir}/${x} \
- /usr/share/terminfo/${basedir}/${x}
- fi
- done
-# fi
-
- echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
- doenvd "${T}"/50ncurses
-
- use minimal && rm -r "${ED}"/usr/share/terminfo*
- # Because ncurses5-config --terminfo returns the directory we keep it
- keepdir /usr/share/terminfo #245374
-
- cd "${S}"
- dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
- use doc && dohtml -r doc/html/
-}
-
-pkg_preinst() {
- preserve_old_lib /$(get_libdir)/libncurses.so.5
- use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
-}
+IUSE="ada +cxx gpm static-libs tinfo unicode"
-pkg_postinst() {
- preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
- use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
-}
+RDEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-process/procenv/Manifest b/sys-process/procenv/Manifest
index c2f1e7233fcc..210a2cd556c7 100644
--- a/sys-process/procenv/Manifest
+++ b/sys-process/procenv/Manifest
@@ -1,2 +1,3 @@
DIST procenv-0.35.tar.gz 251995 SHA256 4b5e9bdf0e7ee7ff63548f380258407bfee64618734db31f33adc332ce02be26 SHA512 c9dab048adba7c3cb659b91aaea5c090d2919a0f38ac53920c433e5888e29d7b0072ca5ba76c4c71cc5d45402dff47dbaee663ff3a3c045e4127032c7467fa49 WHIRLPOOL c186319546607c3fb22bcf97f6ee41099016c777c615a94165624c5934c303f1d2492aa6a54cd15e5e0323abc1c683fd0b16b2ab0825315d4e28abf8f2048b97
DIST procenv-0.36.tar.gz 264248 SHA256 70550499d0602ffbb4bbbe91c1a6d468d44589ab29b74b5ccc42b9558f970fb4 SHA512 0a054541a2ec08aa147f2f6b222bc7c17ce9e5f7f96fae512bfd569572277566e3b3a55ab876668b2678d54b16272427ececfdba5fde2144f18ae992f892d9e9 WHIRLPOOL 100b20b0b9b17fdb5de0e8defe7bd987743bd8c6594a6ac55ef1a73cf10eed90e29bcb30227fe678a16e3fef11e6fac9d1d5a644ee56e9de11d263c9882c087f
+DIST procenv-0.39.tar.gz 270745 SHA256 1ea203b28290dbabc6bd221b857b439ad4f68f38fac560d4966ff6e6a4d71922 SHA512 b34accc92445aeb9ccb1f45dc3cca2fcf25e2e9ab31e2126f086c884e2562093e292d242ba7ef3aa03e342ad8398b01c08fda133a2d8f0a87693be8cb96c621b WHIRLPOOL 2766cb8239f58bff2ee0bc66e4848f17f52b9151fc94044aeff9c766da968c7159f101b0b092121cb70165fac370b7dd237abcc09d8789db5bdcea5468e513bd
diff --git a/sys-process/procenv/procenv-0.39.ebuild b/sys-process/procenv/procenv-0.39.ebuild
new file mode 100644
index 000000000000..7e3c2ba67551
--- /dev/null
+++ b/sys-process/procenv/procenv-0.39.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A command-line utility that simply dumps all attributes of its environment"
+HOMEPAGE="https://launchpad.net/procenv/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 665b16f56dcd..31c6fdf78da4 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_46.0.2490.4-1_amd64.deb 47485894 SHA256 993040282f4315d1d8f1166c38f8b90ecf562be49d4f426b1e7dd4d154ad4a36 SHA512 85e04e007fbc9b024f856ff0469ce370e6b7fe91388a30c5bc6bd62b1a556af7981994157f138fb9f773edbdf174802f24340182a92aea33efcd7782c9bd41cf WHIRLPOOL d2404e314ececab14498946eb64a633759ec5500467802b334ecd5344fd300d62ed367f67ce47765cbba3155561996a8b62d40214936497883eb54ef3bc06ce8
-DIST google-chrome-unstable_46.0.2490.4-1_i386.deb 46816822 SHA256 f3dabbcdde71a172d87cd15f1f8039a1022ab2c83e628be5e438e8f772b20cfd SHA512 c35ffdcaa15373a4b69a83a1db0cd7d6e5acefea8d0fd80ba571ae6a9b1bf961526d40a74f9ccd591a80538dffafde34381a71bcff6f0361d65b63760d6f9cc9 WHIRLPOOL 48ad67d8e5b2e9e7a314fb1f4fd010c9bf55ed1b13ef5df1f820c2b3f53b6e9f7b1e3693cc3faedae2b3400c2fd5f8c6a09678eeb773cff59d978f53bc40dcde
+DIST google-chrome-unstable_46.0.2490.6-1_amd64.deb 47365088 SHA256 df005f45049a04ed234defb21a264943819224bab1bd2ae4e003440b8e8b8371 SHA512 14750d5773d5a9d48c5bf1f0520668597f5b4b30803545f973b002513421d655a194f45220aea544cc1eb274b641cd497c90da9faf5c47800ce9c4e49e504156 WHIRLPOOL 4a0a0784f6be9b16673ceecea583cf229cc7458726c514fb46b13768329d56e13e6caeb58a7c9348b9446010b1635d93ccfde90180b43e8c0bf77200c0d0d144
+DIST google-chrome-unstable_46.0.2490.6-1_i386.deb 47043330 SHA256 136b1c37a48064abed31f1e8a870180d20552208394f367be571edace9393c1b SHA512 0cd0ec1a36a3481f747a89067207b3fa215ebe5866860dd7cd0dc50412e395665308490b59e7fa5efbc7a3d60e4d4e8dc5854c2bc13b8fd64aab52c7fc722f4e WHIRLPOOL c9ece42b8231efcffdfded19e1fabaebf39b7a68cd23b08d96ae11fc4724e3f136a97a952c5ec6e7adb3aef0eb9bd45c744e333940f00fddc937104b38033b90
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-46.0.2490.4_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-46.0.2490.6_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-46.0.2490.4_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-46.0.2490.6_p1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 3247ee2a14b1..bb5932225de4 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_45.0.2454.78-1_amd64.deb 48035138 SHA256 09e3725ddad5633
DIST google-chrome-beta_45.0.2454.78-1_i386.deb 47649086 SHA256 4b0cf7922c4dbe0289a1f5766a628d70dcd9dac8fb5ad49a0c9638e8ad70a887 SHA512 0ab372335e6fbb05876df25cb5791ae420621b4075e39f90c3a569a9cb63e4c44d93c0c0fa4ae1ae20bf8c8284788bf16cf89f712cab7536e291c08294afc4ed WHIRLPOOL 3613f333fa455a8bf3f93b49ddd72e2e3b93a94f3f9773976c60a39a2adfa43c1be7e7e56b14cf9d64e1629e9b0b63b7f6f3b1cff328f70a2e78eb15765869fa
DIST google-chrome-stable_44.0.2403.157-1_amd64.deb 48114486 SHA256 e39bb092d7212e90357271af5212aeba3e8727ff0b94b151fb2bf31b7ac0e109 SHA512 2cb9e4b85e408c4b1e0512f3b8c0624db1594023e0f8a546234fca9d4cb1522da56a2233861d10fcfd23f1d1945d627aec4faf36b791b0aa2c24ad22fc6b0816 WHIRLPOOL 87ca7eb8ccccd5ed92ed57ba06b9f37ef09e336eec1fbf9ae4d5f066373862b08e987dbedea863e3995b95a484dd2cb3633311fe5f2f86dbbc6933571d698c2c
DIST google-chrome-stable_44.0.2403.157-1_i386.deb 47267142 SHA256 78bde46ac1fceb08ea1dc848d63a69300df388cc723a4cb3fe50a6240c590e5b SHA512 9731bda72f7530208885a9ef3cdc0ec1fc4b806d68adc138fa0e3d6187b3e5cbfc1208faec629d2f75dc631c12d98b6be3384efc6909026c8104a27cf47ae80a WHIRLPOOL 94bf3181f26077754f12b708488264b757044fe313be5da73e9798b253a11775db515b905c943bd39f4369fcbc6ede80428846fb56e6aea316757db4f656747f
-DIST google-chrome-unstable_46.0.2490.4-1_amd64.deb 47485894 SHA256 993040282f4315d1d8f1166c38f8b90ecf562be49d4f426b1e7dd4d154ad4a36 SHA512 85e04e007fbc9b024f856ff0469ce370e6b7fe91388a30c5bc6bd62b1a556af7981994157f138fb9f773edbdf174802f24340182a92aea33efcd7782c9bd41cf WHIRLPOOL d2404e314ececab14498946eb64a633759ec5500467802b334ecd5344fd300d62ed367f67ce47765cbba3155561996a8b62d40214936497883eb54ef3bc06ce8
-DIST google-chrome-unstable_46.0.2490.4-1_i386.deb 46816822 SHA256 f3dabbcdde71a172d87cd15f1f8039a1022ab2c83e628be5e438e8f772b20cfd SHA512 c35ffdcaa15373a4b69a83a1db0cd7d6e5acefea8d0fd80ba571ae6a9b1bf961526d40a74f9ccd591a80538dffafde34381a71bcff6f0361d65b63760d6f9cc9 WHIRLPOOL 48ad67d8e5b2e9e7a314fb1f4fd010c9bf55ed1b13ef5df1f820c2b3f53b6e9f7b1e3693cc3faedae2b3400c2fd5f8c6a09678eeb773cff59d978f53bc40dcde
+DIST google-chrome-unstable_46.0.2490.6-1_amd64.deb 47365088 SHA256 df005f45049a04ed234defb21a264943819224bab1bd2ae4e003440b8e8b8371 SHA512 14750d5773d5a9d48c5bf1f0520668597f5b4b30803545f973b002513421d655a194f45220aea544cc1eb274b641cd497c90da9faf5c47800ce9c4e49e504156 WHIRLPOOL 4a0a0784f6be9b16673ceecea583cf229cc7458726c514fb46b13768329d56e13e6caeb58a7c9348b9446010b1635d93ccfde90180b43e8c0bf77200c0d0d144
+DIST google-chrome-unstable_46.0.2490.6-1_i386.deb 47043330 SHA256 136b1c37a48064abed31f1e8a870180d20552208394f367be571edace9393c1b SHA512 0cd0ec1a36a3481f747a89067207b3fa215ebe5866860dd7cd0dc50412e395665308490b59e7fa5efbc7a3d60e4d4e8dc5854c2bc13b8fd64aab52c7fc722f4e WHIRLPOOL c9ece42b8231efcffdfded19e1fabaebf39b7a68cd23b08d96ae11fc4724e3f136a97a952c5ec6e7adb3aef0eb9bd45c744e333940f00fddc937104b38033b90
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.4_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.6_alpha1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.4_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.6_alpha1.ebuild
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild
index 36fe14b887be..ef500c292bf7 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!!=x11-misc/lightdm-1.2.2
x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme"
+ || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )"
GENTOO_BG="gentoo-bg_65.jpg"
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
index 7a9063de60b0..f52842faf0ac 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="!!=x11-misc/lightdm-1.2.2
x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme"
+ || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )"
GENTOO_BG="gentoo-bg_65.jpg"
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild
index a7ac0a4e3940..2fc0be18b6b1 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="!!=x11-misc/lightdm-1.2.2
x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme"
+ || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme ) "
GENTOO_BG="gentoo-bg_65.jpg"
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild
index d960a64e5be7..2ef638718be6 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="!!=x11-misc/lightdm-1.2.2
x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme"
+ || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )"
GENTOO_BG="gentoo-bg_65.jpg"
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild
index 1517eab4e126..dc899de1b137 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="!!=x11-misc/lightdm-1.2.2
x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme"
+ || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )"
GENTOO_BG="gentoo-bg_65.jpg"
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 1856450c048c..85e1f082bb25 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -3,6 +3,5 @@ DIST lightdm-1.10.3.tar.xz 469992 SHA256 1e31b99eba6626ed46b7940cd53cbd585fa53a4
DIST lightdm-1.10.5.tar.xz 470452 SHA256 90b2133916d46d7eeae9b14fb581ae29d09e099f4c5f82566370c21f5c6c6fcd SHA512 a5ee39228a53a666a6cc7600004932e27a3d0ea4295640171794d64b11d23938d132073dfa58289df61995512b6e5a210a4fb5bf1f89c663f6372479cad4f766 WHIRLPOOL bfdaecec39d8aafedb531746d2d28ff494f38d532c5807cb9ca258f0cb531437606dcef77c717058bd14a6e1367709239d13732ee21920919568d897b1996159
DIST lightdm-1.12.3.tar.xz 473512 SHA256 c7dc90fde4f22762f38f06506b64f3b95cc3a1d9ccb8c18efa408087fd054465 SHA512 dca75324e3326a3fdc575837226a9633c7ec967e2484b03e051d5ce2f788dba8e23d4875da3c8d97cb8c6a1da843bc7500876027ca2c40e2bc4844b034acbd08 WHIRLPOOL 22a0c30032dcec66263801285017305b385789ed09b32c3e73c5db27daad44a7c44311d30f2002fe776f10cbaeb5d47727502ff19f61c0465e37987baa231de8
DIST lightdm-1.13.2.tar.xz 478064 SHA256 579f74c175b6cb1e2e304fe8cad462f99467b50701a0b1c85fe455f41caf83af SHA512 929b0a2bacb9cb45c03664b191f7d6022b65133b286ca5af5118bb2ffc12c8eb49dcc9cb135b02880c7a9f5a6e6de59fa432c0e6a44d22426727463367239476 WHIRLPOOL d979f09f2e75a9977f8917b7d711eb803aa564a75582d7b86e24fe9ca410a6d3555081ef7e3b6750344208236f8a1d85171b267cc4ff0cb47baafe2e8f10de46
-DIST lightdm-1.14.1.tar.xz 477172 SHA256 c09827783f4a5f6742cd774de73a3e0f929a2493334f121b4659ea754c817ace SHA512 228be6216c7bdb478abddb20905b1ad3ff6583906addd8b0487d8a7ae62d220efe2cb5a72f896924101b2b01826beb6281e1049792d6f23b91dda40f7b251707 WHIRLPOOL 28c2d2f8a2051d6166d89b629827ea8f64f36ff67ef09dc9c54b932ba25818d9f5c41359f9090f7363ebef0eac11ba6051af5a6c569c3860dce9374b3c5018e0
DIST lightdm-1.14.2.tar.xz 477232 SHA256 28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1 SHA512 5dec6fb492930827c3e07a027411ad5b864f0ef923753c9b8d309c1ab9de9c405ba66b2adbb12784cdd02d9cadebcb5299761ec17bbf1cd4a4202478ce8b427b WHIRLPOOL e9122281e599663af42f06a8d68fc0eae6b9b1c7d820802c14bc9d5bfd32005d4fe28cae805f697ec62587e2e4c5c4e290d37fcb84cf262f538b967c584e9f45
-DIST lightdm-1.15.0.tar.xz 478928 SHA256 1a8a4a4bf81a00e44fb57e13cff475b7cfedf94a09c2be544b04e3b372140c38 SHA512 6b4efe958f2cfd22069ebce74c45c7d059e2cb04dbccd9a7d7ac76e0eaf07000c8f48a377b3f2a65cf9a674bd730d3126a4f3bca8e83fc8768519e440daf6cb2 WHIRLPOOL 48543995efc6beddbc3081a2f2b973400cad7e83e812a15dff8908e6c4e4ed6e82ddd36d642e4c7493dca3e9890ae21c228bebc73d1ec8350997d3c2db230e6f
+DIST lightdm-1.15.3.tar.xz 479432 SHA256 0670c6de84e9edfea3210b42aef688a848fa5366d150a71a67cdf83bc64bda5f SHA512 2fde5b1d01c8bbfa1fa74af9947c4ced9211d0f56d9590c9b5253a51774e2f927a4c6c2e76cde7d34351ae8474bf20e27cf71806c0a4e3a4dffc81b070384344 WHIRLPOOL a4765ee04e9faedfe397b561d17e6ac37ee1738358f7dd00f4be6e4fbabca6a83bd76fe845e4605345053350768363c2027a474a0087d5d37b819a0638c35f54
diff --git a/x11-misc/lightdm/lightdm-1.15.0.ebuild b/x11-misc/lightdm/lightdm-1.15.0.ebuild
deleted file mode 100644
index 2e7a4d397d8a..000000000000
--- a/x11-misc/lightdm/lightdm-1.15.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils pam readme.gentoo systemd versionator
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
- mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+gtk +introspection kde qt4 +gnome"
-REQUIRED_USE="|| ( gtk kde )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
- dev-libs/libxml2
- gnome? ( sys-apps/accountsservice )
- virtual/pam
- x11-libs/libX11
- >=x11-libs/libxklavier-5
- introspection? ( >=dev-libs/gobject-introspection-1 )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )"
-RDEPEND="${COMMON_DEPEND}
- >=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- gnome? ( gnome-base/gnome-common )
- sys-devel/gettext
- virtual/pkgconfig"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
- kde? ( x11-misc/lightdm-kde )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
- sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
- sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
- einfo "Fixing the session-wrapper variable in lightdm.conf"
- sed -i -e \
- "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
- data/lightdm.conf || die "Failed to fix lightdm.conf"
-
- epatch_user
-
- # Remove bogus Makefile statement. This needs to go upstream
- sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
- if has_version dev-libs/gobject-introspection; then
- eautoreconf
- else
- AT_M4DIR=${WORKDIR} eautoreconf
- fi
-}
-
-src_configure() {
- # Set default values if global vars unset
- local _greeter _session _user
- _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
- _session=${LIGHTDM_SESSION:=gnome}
- _user=${LIGHTDM_USER:=root}
- # Let user know how lightdm is configured
- einfo "Gentoo configuration"
- einfo "Default greeter: ${_greeter}"
- einfo "Default session: ${_session}"
- einfo "Greeter user: ${_user}"
-
- # also disable tests because libsystem.c does not build. Tests are
- # restricted so it does not matter anyway.
- econf \
- --localstatedir=/var \
- --disable-static \
- --disable-tests \
- $(use_enable introspection) \
- $(use_enable qt4 liblightdm-qt) \
- --disable-liblightdm-qt5 \
- --with-user-session=${_session} \
- --with-greeter-session=${_greeter} \
- --with-greeter-user=${_user} \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- default
-
- # Delete apparmor profiles because they only work with Ubuntu's
- # apparmor package. Bug #494426
- if [[ -d ${D}/etc/apparmor.d ]]; then
- rm -r "${D}/etc/apparmor.d" || die \
- "Failed to remove apparmor profiles"
- fi
-
- insinto /etc/${PN}
- doins data/{${PN},keys}.conf
- doins "${FILESDIR}"/Xsession
- fperms +x /etc/${PN}/Xsession
- # /var/lib/lightdm-data could be useful. Bug #522228
- dodir /var/lib/lightdm-data
-
- prune_libtool_files --all
- rm -rf "${ED}"/etc/init
-
- # Remove existing pam file. We will build a new one. Bug #524792
- rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
- pamd_mimic system-local-login ${PN} auth account password session #372229
- pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
- dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
- readme.gentoo_create_doc
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.14.1.ebuild b/x11-misc/lightdm/lightdm-1.15.3.ebuild
similarity index 100%
rename from x11-misc/lightdm/lightdm-1.14.1.ebuild
rename to x11-misc/lightdm/lightdm-1.15.3.ebuild
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index de0cda3497b1..482e7fe38e08 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-2.5.tar.gz 63213 SHA256 c379b002a5c77df123149f29230cbb13c7d0414fa86b942444a3183f966276ec SHA512 3d3ff9fa30c20a3b569bb6d51be2101ca38a0f987700020457b02acb0d65aec0380ae083f894a8df5ab9348a4e88c81a75a7ceadae2f820664135a730312140d WHIRLPOOL 596ff803807dc6ab0b34d1f571c1f7694375401ac3507f33616cbf2371fc9f192e698afe88fbda0292ef8272592ec69e61a92cc7c911d8cf5e3b4277aba84317
+DIST py3status-2.6.tar.gz 64161 SHA256 093ffe71605fa7c21ce15708fd8a627584254071bb1f415aaab414e03a0129a9 SHA512 717c88102b649eb134ee03035c694bc5526a0a0d501a5f16bd191bf8bc95b2dc8645d6f2fa90ef91deb96e905f4930d0e2f4fb8a3dfd410f73dda29f7832fbaa WHIRLPOOL ad4b890b624ae7e6380972ad24e8f6599102a4de215226d7b12ffcff55ea8a1b7cf6b55c997471034de6103cc1872d9b7cae089fa7941350d55ea33e730380a6
diff --git a/x11-misc/py3status/py3status-2.5.ebuild b/x11-misc/py3status/py3status-2.6.ebuild
similarity index 100%
rename from x11-misc/py3status/py3status-2.5.ebuild
rename to x11-misc/py3status/py3status-2.6.ebuild
diff --git a/x11-plugins/pidgin-opensteamworks/metadata.xml b/x11-plugins/pidgin-opensteamworks/metadata.xml
index 62f82ad3097f..d7165258f835 100644
--- a/x11-plugins/pidgin-opensteamworks/metadata.xml
+++ b/x11-plugins/pidgin-opensteamworks/metadata.xml
@@ -1,21 +1,22 @@
-
-
-
- net-im
-
- hasufell@gentoo.org
- Julian Ospald
- Maintainer. Assign bugs to him
-
-
- mrueg@gentoo.org
- Manuel Rüger
- Maintainer. CC him on bugs
-
-
-
- eionrobb@gmail.com
-
- https://code.google.com/p/pidgin-opensteamworks/issues/list
-
-
+
+
+
+ net-im
+
+ hasufell@gentoo.org
+ Julian Ospald
+ Maintainer. Assign bugs to him
+
+
+ mrueg@gentoo.org
+ Manuel Rüger
+ Maintainer. CC him on bugs
+
+
+
+ eionrobb@gmail.com
+
+ https://code.google.com/p/pidgin-opensteamworks/issues/list
+ EionRobb/pidgin-opensteamworks
+
+
diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch
index 3b26aca89fc9..c385787df28d 100644
Binary files a/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch and b/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch differ