Depend on slot 0 of media-libs/tiff. Remove old.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

8 files changed, 37 insertions, 396 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index b459bd2916df..d1dd4f3e15dc 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,12 +1,18 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.182 2015/02/01 15:15:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.183 2015/02/17 08:23:32 ulm Exp $
+
+  17 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.4.9999-r2.ebuild,
+  emacs-vcs-25.0.50_pre20141110.ebuild, -emacs-vcs-25.0.50_pre20141130.ebuild,
+  emacs-vcs-25.0.50_pre20141231.ebuild, emacs-vcs-25.0.50_pre20150131.ebuild,
+  emacs-vcs-25.0.9999-r1.ebuild:
+  Depend on slot 0 of media-libs/tiff. Remove old.
 
 *emacs-vcs-25.0.50_pre20150131 (01 Feb 2015)
 
   01 Feb 2015; Ulrich Müller <ulm@gentoo.org>
   -emacs-vcs-25.0.50_pre20141031.ebuild, +emacs-vcs-25.0.50_pre20150131.ebuild:
-  New snapshot of trunk, last revision before the xwidget merge. Remove old.
+  New snapshot of trunk. Remove old.
 
   25 Jan 2015; Ulrich Müller <ulm@gentoo.org> metadata.xml:
   Update flag description.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index fa0b446d61a8..d202c95f78d3 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,28 +2,26 @@
 Hash: SHA256
 
 DIST emacs-25.0.50_pre20141110.tar.xz 24564108 SHA256 ed5a3600a2434fa6c43fbbb711c9ad682f76bcaeba5632031a0053d1fa7c0020 SHA512 db2add52e31be1d696e3634c92f993db124eaa8f3a727d04603cf47ed4c581643594571177d812d6c86584dce357eec6c86a7c9df1b07b09cb6faac4c699daf2 WHIRLPOOL 91cdba50d7ad9f41859d3247b1b839d1a42cb8004e209b1afe8d86f3c27abdfd3f2b1cf767b480f2ea271871b79886c878a899918056c1abb100bfa0eab87668
-DIST emacs-25.0.50_pre20141130.tar.xz 24635536 SHA256 0d7627d217c7b90051af4a0cffe23fe12ddaf79f18a55651627bf5fdf4ce5d0e SHA512 57b8a57a8f46c9ef34b7f5575b6062fb3ac6b47cf913599ecd10187925acf15569cc3cdf35f5775510809886841d9f803ef423ac3c5c600058bfe10aa190d4bd WHIRLPOOL 3dd946dce4f23009a7021de65764f085e7ef1732fcbbd174e1530a0e2274ac32045987016335e11d6e9af2f4c911ce6848f06b8915b56650785a2a06003964c3
 DIST emacs-25.0.50_pre20141231.tar.xz 24688612 SHA256 15bc6b8e1923bb6c1e18e3a8d89652c6594d72fbd1e3c15898ab9df03d19ad77 SHA512 b544f3530c707927c8ef4614b0804505e6cb32d8d6cef45f7aff56f67d632906d447d381a374ef37c6c46660cba1bb53dc7adead308bd902951abcc475593c75 WHIRLPOOL 0f373c4ef413a88e91e41b707686413a93661121453f3a80bff1cba75a17271dd30cd8dc64037487d2dcb2e3f4681af3bc989668c931b006a1bb2742eb5a9d5b
 DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b76bfbc157757baf1446492b5f72062ff0017076 SHA512 85629851ba93d25050e0590b8c00ea9417e2c6839d306276ec3f02ce4d6bba14fe407f32eb07dcc2d42c79fade0678e9e5c098cf1562831a0a715373629a9d40 WHIRLPOOL e58589ac54577800e971232e814212b2954c93c42d701c137283590833420680968f71b46c6e087c4b3d900f96fb1c99edc6420ffbd336740e9b079e01e9ef4a
-EBUILD emacs-vcs-24.4.9999-r2.ebuild 11454 SHA256 a5a2538022d65c11f90c70e659478396d37bd025cc098cb85092e6561edb9eed SHA512 89775f4d5341b9095dafeec87c9fa262e87c2988a20c42cb4151dd0cf8e04ae136c9c588cde7da1a3caee6ed251530835287bfbba4efc2fab77ccbea1f4c1272 WHIRLPOOL 7b282562343aae530fb24483c82c4d38cc46f361a6de81c61d1d04a67ab85b9f49a7dcf05e42123295f2538d72ec0b3d48c61677d35fef7a892e5c5a5aa7e9c8
-EBUILD emacs-vcs-25.0.50_pre20141110.ebuild 11644 SHA256 f48d19c9db1df5fa57cd6dcebb8237758f399be2e2a41f9cf8be7f32b496d660 SHA512 0f2c45ef86c9b2129f0ee2ab644bce1629dedd0ff2256d09eb7fe31cb0227135954ee293f6893d314fdb72be0c2dd2cd01234e6d2692b3002163d70287fbe87f WHIRLPOOL 7107bbac2c486f49651b6fa164a1ac41253195a1d2810fe32e9ffb92625aca645e7bcafe7f2de1db24ea12a3b49e6896c30a028d393e3fb141f952a06b2f056b
-EBUILD emacs-vcs-25.0.50_pre20141130.ebuild 11467 SHA256 f5fe83961b5845bf63dc209ad2e608ea7725b382399b1dec61dae4423c8514bd SHA512 dd6d91b9fc599debb268c2a7127efe12d375a67280dfcad92f62ea14db7c9ece76c65c017609028597b4e502764d922e6711a69ffab4dadaf3fd42205f1705fb WHIRLPOOL 38e3b4fdb7cf47a8b6df5dab34ebe75fc6790632be46a69b95377fc7ba5cbd506547d38823ea8e57033d9061c826b20ad66cd4710d86db169fb9ba78161d3f7d
-EBUILD emacs-vcs-25.0.50_pre20141231.ebuild 11478 SHA256 8d78733a4f580c803ca8302f24be7dc83d7fc8fb19b15439874b6fe41c88110a SHA512 b7b25b1f1b68f5702ffbed52dd4c0ff4dd5c928dc89eb915fdb5658638ddab00449a9d9d8aa8515b603f745f72d9f3ba96511c7909e440b85fa95ec2832b6068 WHIRLPOOL 2c75bd8cd13b285d8579d463b6ff2cda9b9ef4336ee05f3b6143f2d947486d7d24ce522d7b52332b7f0bffccc0e7851434ca6961529f5cd5ff3042f422b4fa9c
-EBUILD emacs-vcs-25.0.50_pre20150131.ebuild 11478 SHA256 e2092d506398f614144675945f11bceb0ec4c62e7523cafbbe037a5305a14f47 SHA512 58bc86693251925377a283b417fbafe2df6080323fe6d52eace9c9e31bb79ae78a0fb3255024ec87dcb9eed6e28f60b2d23328500f711a818a9460cce8d4cde4 WHIRLPOOL 982409d7f2934c44563b7a886cfaa1f79c852fd0dcef3634e675e62b1b104c37783facc3c92e3ecfef888dbef21f04c8c275eb6276f8bb4199b00274665331cc
-EBUILD emacs-vcs-25.0.9999-r1.ebuild 11471 SHA256 d660c6accf6cfd0533fd55c6dfbad34808337fa777013b3dc32f7291072ecd88 SHA512 4e451e25c6ec9c4e52f776a75a976271ec9b3123870a824fbdb0bc31f06096745ae5769c8824816ee5c1609d9e7f4acce8b69bcc538e9279e93a6d3387ccbf11 WHIRLPOOL 54147853cbcd33ad88b1ecb6492e02dc531383c087cee297d0eb2db4ede282243558b94ec4764c12b3353e8c22cf9a7db082c3291344ad3b619c24c0b2189e75
-MISC ChangeLog 82681 SHA256 7565bef00191823a51b3d1e0f2e6b49bbee70e1d751e8e9436ecc804da1d2ef5 SHA512 8546d50151af93b39adf076a8565dae3e4896051b0151936eb0c8925e24c071128ecee60cf44963bda4562cf93d20eaa441e08b81676a95d9addecfd8e43dd38 WHIRLPOOL 38db92ec406c368d07266b519684317dc2326ad5904b72777a9bb91c6bb5deb53e4a817602c7ca105ee77caf81b755c71e0bd17fdc7c35d204889207636a25cd
+EBUILD emacs-vcs-24.4.9999-r2.ebuild 11456 SHA256 d506a7c926f276a4c1da9b3370b9819e1a98b36c10f1212b68224638c5babb12 SHA512 1e7f6541525d6f794f5f65f2eee3b035b08b664ac2d03ecd80fb09f1bb0399caca4c192fd0396159fe0616548954aa48839daa5dbe0ca212c557fcfe84ae4b9a WHIRLPOOL e6f8a303aad8c2874b795e1ac9510389b9fdcc7b74caf9db803f9c8838b4322573fb67a42f9b972b4dce04eecf1656de429f39a2fb48d78011b530bb833285ef
+EBUILD emacs-vcs-25.0.50_pre20141110.ebuild 11646 SHA256 f15d77e96a3e2a6fc89232bab924c48e500c1b4915dab9d2008aff5f041dc7b1 SHA512 7862776776d9eac9140b46986784004b947138bb644349cd43513111abab2316f1f1eb1085c46423605cd342a57081e4514897dae3e0e93fab4aa6e86710285f WHIRLPOOL 83cecd399eba34c71ea127b3dbfb417cc2e3204304fe8f90f506fd4b79708d773569feefabc339f4d70c4de8bd207c77eb1144f36d0a92c92c580e7112ca8c71
+EBUILD emacs-vcs-25.0.50_pre20141231.ebuild 11480 SHA256 b3fb6853c5582c0169628bd1b1170f7cec437c71d58579efc8daf526bce290f8 SHA512 e7cf64c2ecd757d88689996a047a0297732e2c7970bcc08342dadb58a6bc0244cfde587f4b78018db2d5d17a9a2a13ad68ba7e6a89fb76b276aff0f541608693 WHIRLPOOL cf3cdd3d45155c49330820f47235a3ccdda1a71c432afad960bcb612d8f75a61a2526ee641346cb50c93cd425e3754c607d2975950264f033c039e10d99d326c
+EBUILD emacs-vcs-25.0.50_pre20150131.ebuild 11480 SHA256 81305809c6e1aea0806a8f5c7795c0b90c08c18fa643f74457afbedf6bba2ccc SHA512 f391a73ec56b70153e8131386183ad26e9a2a5441cd2b5d0b02729f3c0a8c137cf97efd2574a33e2b499f5777b829305af826de3e682d1d2842deaec8076fb95 WHIRLPOOL 03f7b52dc2394ad593c5b78ae9d383cdceb3c39776a2df113fcdb5ee1172004d929ebcc6a15c477dbb0e7f029dc6d1aa6a22f8a3df5b08a776bd17429b6df1ce
+EBUILD emacs-vcs-25.0.9999-r1.ebuild 11473 SHA256 e28c664a6a3199c3851e30972960b3cc1244809e05ee96a34d96ff367c151339 SHA512 e9bb5761902579fd2479541167bc28d2207b9a75556452c9d1cb66de329a108fdf5e556f31aa6debee8865d56df3d4306a9deece0a15990b21f4b392491a75fb WHIRLPOOL be72d0ee189fc5bb81ba1e4dcbf508cc7b992943d599baa04c83343d54205ad53e61898121af43da087b7f7dc9c66937768d4bd26ff0283195a945f4f1deb44a
+MISC ChangeLog 82961 SHA256 19592d2fab48751036b6c105c9f9fd9b6ef1c778cee5311bc3b2b785f24d3396 SHA512 34ff1c9008d4740d6e9c17a4ef6db716b3d4b850e45af245e66ffb9519212013bde8a84853c12431c32f6af76abb60dfd9ebd130b48056148729a6945abecc82 WHIRLPOOL 746282151ca4b9e83ca58a7117228715709aff28ff269f9facc3e8ee3f73916f39dbedfe83734954404982602ed2bde0056d08bb80b0cf6b64fa15c787aa502f
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUzkR+AAoJEJQzkH1pP7W4FGML/R6s2dE00a+uXUUSXE35fSXX
-EtMAGQvsJN7zwaIJkHG0WhayHZzOVvssS4pyX0c6MmP3s621inao0/NIjuKVLVN/
-mDvK/4nVjZe9UhG2HWKDo7yTt78evfoEDfD3wykOJ+INhkqGrLbYlxvaJjLzaqQY
-l5fFu/XNaQkNP8y0uw80ajCTqVX9k5fTzNFnn48TgV7TN4hET7R1TKROM3RI/BbY
-rwigBw54G57zrp/qaKMr5ZluxocD2NMZ6yIr9u8sYkm4EHqMg3coc3GIdJFQwT7k
-MhVbEs3bynzf5CDBtVI0+lo2lCppFNfofzXzY2u3t/EdpXEGz6jZgrw/r5vqWpD2
-sc/8tCrBvwfPbkOsqeXie6nMEoB7qj8tblMF19d6aE0Ev1VNF90/7fTI+/rCYE8s
-lKAFMtaqUPsgfJY+ajBtBI1DSHJw7+bdm7wIh7kQsjIoAuriCScHeOZzB4XGK3tz
-l7AslzZpY07k7FH3NIp2aQNwfSpOvTqYcr1g/pUhmg==
-=cgTW
+iQGcBAEBCAAGBQJU4vwfAAoJEJQzkH1pP7W4YlYL/0FDQT8iiDbkvarUZ6yfR6F7
+lHjGX9jFS/ZUNvhCc6gX8oyXFvVwIaBmz7Bd4WGdgaLaK/uvVHHgLXP43JKXy+Oo
+6Uqg2UBsVYGs7YHp/0+K6hmJQYktuCcH5ZD1ilG/t2K4iFGDF3JuIZxP9jTrNBoF
+oPtsQfMGHEA/R8oP4lGweIya1vqw9/A/f01nLwNFQm1Owo+Z4ZSTD0RTVWt3j8P3
+t8rK4sv+pERgzbAdUX7CNPIj7PpwRBrnRkBGHYC4UxgnaFeJY/QJXX02UvfY2S64
+67xsiyROlSxXu/HTII5W1ZuzaJJh7OXGDKniZ86CpXl4vEnG2HI+WkoExRlexhzR
+VF+lY/7TPuAu7UJxR4CYvuNcoCpMF6lNFBndaAeBKcdMVRA51vROqaXiE0Zpq80S
+vO1HGQ4xjGh2wzpb2hobXTrVoJy5YWIpYnPd01OtkpwO6pW3vthIS1sjbetzXqX8
+mUguS+SvLwOdJe/IHc6a6pStVWJ2QgcAihOK2FpooQ==
+=M3Ys
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild
index 2cfd60d1196d..eb6f0d004796 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild,v 1.1 2014/11/12 08:45:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild
index 9b6767ecd7e6..30ddafe6ff82 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.2 2014/11/13 12:55:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.3 2015/02/17 08:23:32 ulm Exp $
 
 EAPI=5
 
@@ -61,7 +61,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild
deleted file mode 100644
index dd2ae623c233..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild,v 1.1 2014/12/01 23:23:11 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild
index a396b528bc9d..bb4deb0f1141 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild,v 1.1 2015/01/03 12:17:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild
index fb1106f9a9af..0a7b420724e0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild,v 1.1 2015/02/01 15:15:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
index e561707998b1..4f5ee2357bc6 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.3 2014/12/29 11:28:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.4 2015/02/17 08:23:32 ulm Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (