Version bump. Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

4 files changed, 15 insertions, 44 deletions

diff --git a/x11-libs/libXaw/ChangeLog b/x11-libs/libXaw/ChangeLog
index 9dfddb45add4..42936d939f4b 100644
--- a/x11-libs/libXaw/ChangeLog
+++ b/x11-libs/libXaw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXaw
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/ChangeLog,v 1.132 2015/03/03 11:15:44 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/ChangeLog,v 1.133 2015/07/04 09:58:44 mrueg Exp $
+
+*libXaw-1.0.13 (04 Jul 2015)
+
+  04 Jul 2015; Manuel Rüger <mrueg@gentoo.org> +libXaw-1.0.13.ebuild,
+  -libXaw-1.0.11-r1.ebuild, -libXaw-1.0.11-r2.ebuild:
+  Version bump. Remove old.
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> libXaw-1.0.12.ebuild:
   add arm64 support, tested on A53 board
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 282d8e301472..9f9c42283566 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,8 +1,7 @@
 AUX libXaw-1.0.12-format-security.patch 818 SHA256 bde20c0fe5ee51debd2de15bcc4368b19104a18d79c76bc3d120a7c7401a7f51 SHA512 d08763618a02eeb2ec2abe339566d7a2d2465615306831e4ee02ee2b1699446e598d5aa8dd36356936a87c643900b36845e8419bfa1a1570431c4b5a608f955a WHIRLPOOL f10bfde72933bf0d7fc8c8f82dcccb966cfb5f9403792f0083b5ac90a5f14e8714e78feb10d3be75b7a0ba8b3355d13585d4c153d70c86dd450c66fa046c63c2
-DIST libXaw-1.0.11.tar.bz2 649633 SHA256 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492 SHA512 01a990717501cf7b9baa7d3b3a0cb1d21e52a736765b84ccb7b4051f5fe06f1e480d25b80f3600fed86bb147de90959658f0db0fb1f3b411d0e532a2f196ad00 WHIRLPOOL 83fb251ccdfccbe00c47cf1b1093f312e326034579600a64fee35c1a523a6c9432543678ec9278c295b027808c313c69800dab06b83566936768c281eceb6c63
 DIST libXaw-1.0.12.tar.bz2 677147 SHA256 96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6 SHA512 baf11625a20b89f08747e25dff6755ab796c8a5a91341d3cb21f85780733c4a3c25bbf134ac6259982207067d0a617f83f516c48aef6f57cbab14c8a9862944d WHIRLPOOL f23798a3c221d6f23de9b8d708f5c054d39d6681df23a53ab7a3c221215dfafc23463475e2d8290d609fd591443e35c1d0e9bc939a528eca3c6e757d7dd2d6e0
-EBUILD libXaw-1.0.11-r1.ebuild 883 SHA256 416ca7bd7956794d1cf5f5bdc90a06e8680fe583da2daf51778d4c0473dbf73a SHA512 86a16500a7c08aa02fe4d9c5943ad5651d6361d877c178e6f8e2a0844461a6161347424e3c63318d394c75def15da7fe62ee882bcd27190a6e13ccb03382423c WHIRLPOOL 0605b3d059571ee412ac5590105fa97f605e52edab33ed30285e841ee78e9698d0d30aa7312bcc0e837b14569a1d62af1dcb43c4388295f378b344bce96d8462
-EBUILD libXaw-1.0.11-r2.ebuild 1117 SHA256 10ebbec6e211e2d27c116d0a1f118b2f87148b40a922facef5ebc2b806e8528a SHA512 04b934ccd60e93ccb966cb95ee2af6256006eab8f9ce9eaa471597b0bccd4ba6aa411bc4525c992beb8d545f0eafa1d49640164ab78cfb2f1dcf9271364d2603 WHIRLPOOL c59ab86cbdd9a04096b0640bfc3ca6bb0311bf2be759cb7b07bbc59e1d10a1cb7f0435ee068845cda317b415c26239802998df4858103990805922d74fe65a7a
+DIST libXaw-1.0.13.tar.bz2 674140 SHA256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f WHIRLPOOL c2af8386b8803b0429bc27875761214a5dbabf4b3feda69af18ddcd00ae6809a3de6fa0912ac1299cbb381d4d8180d1a57f2330639bfede79ef9bcbdd6e6fd34
 EBUILD libXaw-1.0.12.ebuild 1235 SHA256 a268e85692ce30440ff0f9cec61a26c5353c836583d99615297552517d9f11a0 SHA512 1cc89a2fde12620fad9dae6b57388b765b258e6d81ac2c5f45eadbda02ebab479ee50d432d6ab1d017d6e7be825766d0748cc27fe1ac65c32a58dd2148f303dc WHIRLPOOL f478caed7fd31b8d04b815152d5a8baec9ad82e52845786e2cb3da086053acd22f7ffbf49d4d11535cf36bf4642eaa28ab97d36e01b1a6456e9b4de81787bc07
-MISC ChangeLog 15304 SHA256 747465e443e80d443099e7972b5db6a5b2a395399709594f25f91711227fe72a SHA512 6aa15e765a95bc1048db0dd38f043c5f0dd131c561537ea81616b2713698404f74a95b3118d92f12d317bdf3b805dca509ee10ba77d4f0ddf143d6902971a7b7 WHIRLPOOL 5a83376612a4d02dff79c03e7b65bfeefb56e4d816e23735e444df0d1dda256ac8f8866cec0aade7dedc85738a97e99e4db661b399f516c5cdc0559483e1094d
+EBUILD libXaw-1.0.13.ebuild 1127 SHA256 3810b708c2df064f955633670cd7395a4da8176ef44b66892528503ee453f078 SHA512 aa7887e150f03381d1fb9b526f29237527a3e690fa35acc4def1c904f360e4609b3756b1b3b17dccff149d8bdce7d30def331a727f8e3c9102c0cb86e57d3add WHIRLPOOL 0747180e754c08ee273f842593cb6d40fa02cfa2fb638307516a4bf9a2b701f2493eb74b3ef16bdb817675ea55e9198b10086a4f8e26d8384187e167d2f47e25
+MISC ChangeLog 15489 SHA256 ba4deed7f81b17a848d766b535aa53aa3378f36f9dde67e70c348801c8e6cfa4 SHA512 6bc161e68191be653a01ec4ab5728780d310defa2b1d3c50785149d9d94489e6546af472e5acc44e8569c2e593121f089c83eaa4b2cce8598873d5902372ee24 WHIRLPOOL bb78175238d2d18aea6fcd2e1239825ed93a9c5340e9ac00385779b1e5fd0960c5802255a6947c5202e89a47df659b5f902ab5fd910ed1c83d61d21ee4cbc000
 MISC metadata.xml 234 SHA256 b5929b0ed3b8b6011d0d04f255ce4f305d69c38cb221b28425021a9bf7ed1254 SHA512 2bf360ab4ac54b2eee2adbddc44745749a3fe898d8e23d9bbe5b59f9d43c862540ba7b7625eecafa5a55c61efe91b3ab374a0ad67b0339a437f40b78708a641d WHIRLPOOL 3a0d9ce52ec7b0fe5b04f98041bb27583afcc225c29022fa93efd62fa7daa80e3c837c0381cfcbb1f9250ed19de15209251fdffd1404277f906e3c7e564ef9a3
diff --git a/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild
deleted file mode 100644
index 131cbda97129..000000000000
--- a/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild,v 1.13 2013/02/22 19:27:03 zmedico Exp $
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="deprecated"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-proto/xproto
-	x11-proto/xextproto"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable deprecated xaw6)
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-libs/libXaw/libXaw-1.0.11-r2.ebuild b/x11-libs/libXaw/libXaw-1.0.13.ebuild
index 62e0ca0aa033..f2f53718ba8f 100644
--- a/x11-libs/libXaw/libXaw-1.0.11-r2.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13.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/x11-libs/libXaw/libXaw-1.0.11-r2.ebuild,v 1.2 2014/06/18 21:04:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.13.ebuild,v 1.1 2015/07/04 09:58:44 mrueg Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -22,13 +22,12 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable deprecated xaw6)
 		$(use_enable doc specs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-2_src_configure
 }