Fix for build problems #552044. Slot updates.

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x377034660A5828DE!

4 files changed, 39 insertions, 29 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 155e0585febd..3d5940262dcf 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.192 2015/04/11 00:44:43 matsl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.193 2015/06/19 22:28:26 matsl Exp $
+
+  19 Jun 2015; Mats Lidell <matsl@gentoo.org> xemacs-21.4.22-r4.ebuild,
+  xemacs-21.4.24.ebuild:
+  Fix for bug #552044. Slot updates.
 
 *xemacs-21.4.24 (11 Apr 2015)
 
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index f80d96445fda..56683c706768 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -19,29 +19,29 @@ DIST xemacs-21.4.24.tar.gz 8543879 SHA256 9016a51496d4978cf3dba75000a8e38bfc8cb4
 DIST xemacs-21.5.31.tar.gz 15802193 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41 WHIRLPOOL b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59
 DIST xemacs-21.5.33.tar.gz 15781151 SHA256 448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151 WHIRLPOOL 29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a WHIRLPOOL 733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209
-EBUILD xemacs-21.4.22-r4.ebuild 7266 SHA256 4c1624af125f8ed40c6a157a949346477fcbbdd862f521aa81876c425d4d40b0 SHA512 6d23d9cce7ca54a53803cde5e2f1c957efd06df0759d758b57eb90729269a4a98b60717943ad7249ce49b9330a869acc9784ce10de213f29a55acb05ed3ad803 WHIRLPOOL f480620847903103dfe89174d2fecac7fd613595c3bf7d26d3f941f8029299227dc7ab15934732379015b8fb5a74a650bd8cc074e08c647172cac7b9988bdb79
-EBUILD xemacs-21.4.24.ebuild 6776 SHA256 15cee5a3d16192f477779a1ed47e278d77c298bffb3bdd2a5f0f185354874ae4 SHA512 777844f35012338e8fd6b1cd6d5cfeed3cf99663d29cc260fb1e76225c3734e6b789dc499da0fca703e83b50c929a305cfe282952d026ddc37570a7afee5e5c3 WHIRLPOOL 193aa817a777fc91d4252ac8cbf1ec0ed16824b0d06db0e84840c98e840128a1c436c2a5eb4b2bdb6841d05e34a006ea817a92efc3c78fdca3cc2dd49852ccea
+EBUILD xemacs-21.4.22-r4.ebuild 7391 SHA256 20269369538f7097a6a9151610a848c91f3571baecca97dace6cac5dbd424589 SHA512 e4d95950e654bd4194ff255fa723fdcc824465550c6adb8e84014ba49f88aff565cf7a9bc243a02ed7b667cf1f302dcc97ac9e9ce774c407a5f6a7c51d085334 WHIRLPOOL 800e5ae73b675bec3f62f4bf6c69a4d35cffc7081db0fd8aa145e3eb921b9671f26c1527e85b13ef22897107a08eed289f37e02ba02d292b248b47a1d754a5fa
+EBUILD xemacs-21.4.24.ebuild 6905 SHA256 0c9ae19e48f1bde31d21916ea5291890822b065999b3c2a9f3118313857351d3 SHA512 b1d326f973be9042e099547a15760964f714b8372f8377dbad4bb627c959ab65c348dfc556bc8ced1e28d68360f2b62bc5b9aebe8f75bb954a26c1538a4f0332 WHIRLPOOL 3e8ac248bf18e302e70d82ba96f8454577cd641ce1c27c1519596dc50fa4dd5ca972096a0415d32ed2ce71a5e5dcd72d9d5fe118257920610b225520926ac190
 EBUILD xemacs-21.5.31.ebuild 6686 SHA256 032f613c6fc676d137f1321c30ca413a4bd6de17b9ceb3de39d5b2587e95d46b SHA512 6cb54ddbfa57b0153f4c63fefff7e1bddd1a5c59aad14438d8b2e633d30e902a96bc1b79f0a655d4af70d68a8bb8ef178487eaa038216b89addb4ff96e3d16e9 WHIRLPOOL 8b7581f190486e3b67c7d99b69879c5d63c6994b53f47d1749121d49a13c7fb149a7588b92c8112d8947a6d63686f7b9ad683eb34b2db0743c2db11481484358
 EBUILD xemacs-21.5.33.ebuild 6547 SHA256 1c3cc3f9c1417d48593367af80819daf753f0f4585082747c697772fbff0ecb7 SHA512 6da1b464b38ed53b84266f86455cf42a276e5122e41f2fefda9c888eb31b2f5b95797d390552b3786d0ae4ef8f1d64518d8dd6a5a00461c64bf623c3a683baed WHIRLPOOL 3f49f8f2a4d4d8753d5202c35d2b279e0765f18193a8e680fd222afd6642acaa9235029d5c8692a1f7b5e9e6f4a0acb70360796fb1c055bc36353fcca66ea782
 EBUILD xemacs-21.5.34-r2.ebuild 7147 SHA256 2139744e0c42aeb80faade698b4df6dc8b1a163a80583af57c2ab19bd8c903c8 SHA512 01157726a8c609cf7acf0f20335e27a61f3222583635e8f1fbeeea8831b4bb379a87d5c8b3fddb5a0d00380aa8f219370e00cc8ac4d07604e259d1aaa2f3d240 WHIRLPOOL 196a182136194ee5dee885fbb199a4bcc36d57a5f1559cea66b2a9e524b37770c894153bb5f25f605b87b5cc70c9b1247e9f6374d5333d80b96203b8be7268ac
-MISC ChangeLog 33008 SHA256 940a278b4de812f9ab42cce9055ad10bea3addaa9940057b7934768462a498c2 SHA512 1d71782d1e8dc12b28b953992270b00490b8c2c3c68c7ef8b107bca7bdc0601a0f0d7a63c7389047d3f498ad771dfed95f6da9a2b8202c8591fc51389f39862c WHIRLPOOL ed565895362d1357740ad8352677a0ea567710e4c2ca54712342794f03115698cec15a69c3a666c9ba944dfd1b273d5375f9f392dc9d5ff0eeca5812a5645af1
+MISC ChangeLog 33143 SHA256 35f8a3eba0ce17e1c38c02ee664d2ae0e80368c19927cc80add68c6bed9bd1fa SHA512 8138c1b65bcb38f3003f889b6cc491c067893a0c26ff814267963e8b42f69694f84d43c5bdd61d1e0e79b65234340a889f59386ed2ec550544356bc755e52c2d WHIRLPOOL c6284acb09c0da13b5001658675852962fb1fbbaa5f576d4a998c43cc1851fd153f4067084180b463a305274f55f50f99f952213169f482c879069dc47d58623
 MISC metadata.xml 711 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58 SHA512 b201e8584db8c7f798137dd79d2136639a0456e6127b28259ac42535664d608ff3d290e30f28ba2d71cf6c971ff5f5048d9b7911bff7907f715acbefb54d8048 WHIRLPOOL 0344fe6a29e42f5088260ccd648c83eda9cc13abbd78fa29db799ed66bed2f385735f7cd54aa5e00cf61f0cc1673892f207a553d9ccab55141c76cec2e179bfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVKG6JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVhJeYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRERjkwNzZBQzRGQTJCOTQwMTUxOTRGN0Qz
-NzcwMzQ2NjBBNTgyOERFAAoJEDdwNGYKWCje8F0P/R5uGBtJzb0pLPNED79CnXI6
-FKz9VBLkhSQE2HhANt2A2FORpjuSEjGfSmsvpaPR0HkgNGtSfPJcDTnbqO5pFBRA
-aZ+1Ro8wSk12PQKOmWs1k8ZLTnlgGSO/KFtDnyTSs+lt4FWUgFseXmI3L/1dPcoK
-Q3WwF9p9lme/1FcQK8AN7S2F9uasVoaAoakpmnt9TlvNU64NLIJ1Q+DVHqYM7mVD
-X2WddrKORyx5vsi9kAub6mICv1wzEoCcCIgyYipqxcO85kEVHsYhVypGh333QcwV
-BGnuh5vF9H8QjXylDh+jVufIpSY5URntbdF3xZ0eEZNUojB38mWozxXHtZYervo6
-xNlJ/rqyPm/QmQqY7QPrIsBZg+ixME2JlRI9/RyH7YL2bZl4ocMjqgydt2qlMCBz
-c+r2ypWCgRKtCtB8J0J8f6kli011Fs1ZGNNnxB6fdwVU2PVYLlAQiZ9290X+w4eX
-hLzCfNFti8T1meweAEtB5pYNrTN+5cn3STq7F6XYeEpJIJeNexXkOqYpqFp0Dw4A
-80hL9VtaI2y22PutmfSfFoCKd/L9P/EFmQdWJhYUNbQTje7xiBupKzYokAZxdUyC
-DnDuOTGv1FFZy5WIRC5Z1pwR/gxH9X5m8j5oIa1pZBakMeCcLBkI8vt+uOln0Vtp
-bXNe3RlrorhxsjbItRMd
-=+cy0
+NzcwMzQ2NjBBNTgyOERFAAoJEDdwNGYKWCjeKg0QAIlpSSWCTNTwDp5jyg3DZyQj
+AwflAvTFOwAVPwgOCSu8JFQnDOy1+NVKovEEfpSVCcmUxRQ6EOLyINEoaf9My1pb
+FTsmk3Ujmsr1J/Rhfk1lEqy3kwlzr2jCF2Ywn09AwOOKvIl8aZ1/pSaJxF8JkOwt
+krg5ycGSkSe5R4vHyByGdMcEmr9tfgVQJ87R4kxvoeslEi0cGIsP8AHGIlZPMuBQ
+jP6VF8Y6FBYizGNf0XWyKyg5M7VEA8Hbp8bh1ljrelrAze3S3fpgiIYX40VFslIf
+BphqPJyvk/CpjNd/BLiB5U4zZ9n5Uh2jO8zRLLOpFo7Mji6yhiOUkAB1UbHY4Ak7
+bEvauRsxHtXTOwRk+2aiH9/O9DgIqVMiKjGghzNRpBIbGyprQpnP6A7icEuLZN20
+KrMKPGEyF1WoHktaTJVTSi7+gPYl6I4Zr3Qlywec0gd7xVIQ8ct1F3WcF9kXBZpO
+e4pupycUOmHnaM7RNAfcfBHRP7fV0qnEGF6KWyl1T36WoqUkVCKNnOygRL39aGIW
+odZhMAQocgyYD39tAbzrJMN0XwPCvWT4yIlL5tBxuLB4qLKJ/j+TvNqN1YXoPL4m
+Uu59Ib4mDRm+h+mI2k0bFMEkXnS6bIcVR62c6Tck5f4V0cv/Rknj5Lv7o32L+oBk
+Fgwv3qtliOX4fa5qQcA/
+=Vht5
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
index c52d97c525fb..98a09f5dc5dc 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r4.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/xemacs/xemacs-21.4.22-r4.ebuild,v 1.13 2015/03/31 17:41:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r4.ebuild,v 1.14 2015/06/19 22:28:26 matsl Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -24,13 +24,13 @@ IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
-	berkdb? ( sys-libs/db )
+	berkdb? ( sys-libs/db:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
+	>=dev-libs/openssl-0.9.6:0
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:= )
 	ldap? ( net-nds/openldap )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
@@ -180,6 +180,9 @@ src_configure() {
 	# Enabling modules will cause segfaults outside the XEmacs build directory
 	use ia64  && myconf="${myconf} --without-modules"
 
+	# fixes #552044, deprecation warnings fools header detection in configure 
+	myconf="${myconf} --cppflags=-Wno-cpp"
+
 	einfo "${myconf}"
 
 	# Don't use econf because it uses options which this configure
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 32dd8fac1021..4de8caa1afe3 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.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/xemacs/xemacs-21.4.24.ebuild,v 1.1 2015/04/11 00:44:43 matsl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.24.ebuild,v 1.2 2015/06/19 22:28:26 matsl Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -24,13 +24,13 @@ IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
-	berkdb? ( sys-libs/db )
+	berkdb? ( sys-libs/db:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )
 	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6
+	>=dev-libs/openssl-0.9.6:0
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:= )
 	ldap? ( net-nds/openldap )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
@@ -40,9 +40,9 @@ RDEPEND="
 	Xaw3d? ( x11-libs/libXaw3d )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff )
-	png? ( >=media-libs/libpng-1.2 )
-	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
 	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2
@@ -162,6 +162,9 @@ src_configure() {
 	# Enabling modules will cause segfaults outside the XEmacs build directory
 	use ia64  && myconf="${myconf} --without-modules"
 
+	# fixes #552044, deprecation warnings fools header detection in configure 
+	myconf="${myconf} --cppflags=-Wno-cpp"
+
 	einfo "${myconf}"
 
 	# Don't use econf because it uses options which this configure