Add savedconfig support (bug #515722).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 74 insertions, 19 deletions

diff --git a/www-client/vimprobable2/ChangeLog b/www-client/vimprobable2/ChangeLog
index 730017cc806e..b31877db1695 100644
--- a/www-client/vimprobable2/ChangeLog
+++ b/www-client/vimprobable2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/vimprobable2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/ChangeLog,v 1.8 2014/01/23 00:53:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/ChangeLog,v 1.9 2014/07/19 04:53:56 radhermit Exp $
+
+*vimprobable2-1.4.2-r1 (19 Jul 2014)
+
+  19 Jul 2014; Tim Harder <radhermit@gentoo.org> +vimprobable2-1.4.2-r1.ebuild,
+  vimprobable2-9999.ebuild:
+  Add savedconfig support (bug #515722).
 
   23 Jan 2014; Tim Harder <radhermit@gentoo.org> -vimprobable2-1.1.0.ebuild,
   -vimprobable2-1.2.0.ebuild, -vimprobable2-1.2.1.ebuild,
diff --git a/www-client/vimprobable2/Manifest b/www-client/vimprobable2/Manifest
index 7149825fd9bc..db67bbc27f2f 100644
--- a/www-client/vimprobable2/Manifest
+++ b/www-client/vimprobable2/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 DIST vimprobable2_1.4.0.tar.bz2 44599 SHA256 dca8804671c64676b796228cfdd60c5ef4e44ccdd109b362c7d51c05ee6241b6 SHA512 1eb82cf50e8f33e2841d43f6a8cdd46caddb691b4f41784ae852b960533c1796561bb7253ceb2347dbd0a8accce494702c392a2f5ad8daf7a4b41de12d962a4a WHIRLPOOL b5c2c06e4387cc01d9e33f45255a1e34931f85606a82eba96f340e44b49c2cc43c83111236fc7d63ffd2fba5358786e9d9284912937d8c2ded182ea4cf89f56f
 DIST vimprobable2_1.4.2.tar.bz2 44730 SHA256 f9cfd25b75e5761378c40dfbdd1fe8c3ea7581ae1b39d11e1b39413d6bec4d8e SHA512 daf55843d3bb028673b4937d137ee532feb3324ca4dcd5a1c57fe7f6b0a02e35d0f8875bf695a3c9ae1d988840e71bfaad45a9f92c981205ac358fc2832d7e58 WHIRLPOOL 748573214f96d14916ff4b95b3186f1b6a45cafeaa55bd423e16c8f761a770981e07247c9c1675cef1f3554ed41bbdd0d376f776cfcfb0f3430915999fd45a91
 EBUILD vimprobable2-1.4.0.ebuild 772 SHA256 68c8a7e362b2a7fbb9189e4ef4b4a16df440658e64badbd8ba63d98c731defad SHA512 2000b9777d6c2d3a856e717b32cd4c39de46bb687986d764044478a0f09d15a20a149804dbb75181e64aad931c993cebfbb436dee254975b0f7db1aa3906a6c7 WHIRLPOOL f3d381135e823fd70330bb60f811a9ca925d7263bb5d40733ed0dd0f1bb5dde3d0af30243e5ee5964a772f4b64aa1f0bd95aab25882a7f33dd9496ab2ecef361
+EBUILD vimprobable2-1.4.2-r1.ebuild 987 SHA256 c5974f41ca1c0afc520c0e9638fd62722dbfdbc63591046665e00fc2634a74e2 SHA512 3714d47923b5a094b00bb04919a7aed83b20bf36863fd8a383acba2970f0e8ac25180356eddc3a4b46df35d199fafae4221eddc9600e437e8573d8051a9f1359 WHIRLPOOL ed1f608550b3dfda4b7443c39ca05308bf7f7edb4d89cff06a34e14c7e4ac1b0465f26488854f015c51a5323aa1dac726620a6fd5d7633e228503c272821655d
 EBUILD vimprobable2-1.4.2.ebuild 772 SHA256 180a74fb7699e7a76e4cd802a1f378660e3dbc9eca782deb2069abc5635217ff SHA512 a75b9c5bca1bc5f6cb3325fd54fc6f81e2f7474ab927c7ecb042162fd939fd6fe241dc508dd2d97a231d8163e4b4c90990dbb99d6fb61d51ab33a3ca92a6c48d WHIRLPOOL 3a737af1dd063f699f2e8ab40c6bd9f4125a725efcb2ca80226cb24b4b10dffef7a26200e9a76558d469255cf42a52638501a8c22b27653f08e806472bf974dc
-EBUILD vimprobable2-9999.ebuild 768 SHA256 5b2e87ea068b6e5fba18dd5113be801272196ef593b1a048f66eb2f4697473b0 SHA512 45c126c2d0bc9a6c7857959c7f546e36a4e6646158de6e634cefc0089ddb11ea94b978f7bf484d1ddfc57387e522628991e62ecb0429a70df7184017bf06da07 WHIRLPOOL 8dd92aff3111e7d074f51dc4e90866c001420dc92446e70d1ac47afe6c3ac0159a70460a8b011ec4e0905f5e7ca1e178eec9c7359a32702f95161ab8655cddd6
-MISC ChangeLog 1446 SHA256 3843b4bfaca500f12926158937490eae40e749d3efad702bb11e80970b71f722 SHA512 0797041c00c7db8bf1a0eca4bd9d8325567930def29c57bbaa6127f8f8f0aea57c4c67a9a86b8f8107a2550f2eecae75f56415063d80c27240ba23fa93c265c0 WHIRLPOOL 029672835ca96b7723e4c65ad8bfd055cc24b06fa194931977d4c21cf8dc0c3d6386a2715f276eef04a8db97c4e25dceff7f8815aebfcfc85aadec6f0ec848a0
+EBUILD vimprobable2-9999.ebuild 955 SHA256 d36e18735321fc821be7aba01ee0b1805d3558f412e034fb066edae119d4d3c9 SHA512 99eaa35f373ad5640e6fc6fdab6c4edd4edd59f6abcc15c8b4c58a7ef29271b9525f3af7bdd84f26a30edacc3f718d92e5b8e1c4428009c5843e776558299217 WHIRLPOOL 018e4d9977e602d0a2e2963c1535ae87929a5b3bbc5707a183181fd423765c8c246ef28654311d6e3ef6c24881437371b2ffe89bed77b2ce3bf0a2dcf5ec95a4
+MISC ChangeLog 1634 SHA256 3d76ca6d8edafa22b795776b3860b393b4fb740d0f194ce4ebb70c959e8d1f56 SHA512 e4b44d871b0c191e82dd8938c950bba4749099b5f621dd5f36499adc608d5ead263750b58706724d2c9226239a6814ca07571682464ddffe967625e4efd8b67d WHIRLPOOL 9fd045c8e643ee2a21fa61d5b2647c0e837f688d57b610871cc7471889326a4a0f337531a3feff396c43ee50cf4bcc6431308742cd530fbc933ee3dc4cec6fe8
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJS4GgDAAoJEEqz6FtPBkyjVGIIALUimzpD24wHCvHCazyMLeO9
-DNAMg6cJ/tZ1I9UaGslCzz1/szdJcB8bI09vgz27VCC99OKOrUZAzrZd1qiGO3Rs
-ouh7TSqru7s1ZvA3xSS7TsMsW16bJEIzFpRNwjqmBG77b0Shx/VUFYx2KXthBH8K
-u/msRs60Z//Dbso5CCbsiE5oqvGy08Z80rcbZZz4meeGAHUGRd1SsC28RXJNriiY
-y9AjSesRqdN8zkGKL23GFl9n9N8hFsYB0nUuhUuQg+Arw4Q4RIDMd1k2DNft1op1
-obJ7xVWH62h1Qdww2kz9xuw2L+jyz0kR3efOBJmKyLLCUV/2K6IufLNqBCkzYPI=
-=FywY
+iQEcBAEBCAAGBQJTyfnlAAoJEEqz6FtPBkyjoF4H/03hKtga0wNxpBSg+wr3AX5G
+ayEq4y3n3CVNgGJjsR6zmESu+rdGBYkz8xJ6VBwAzF+F9oeHuMo9WhhIrK1WMQXa
+MBCTLawG/4FCvk7LXAuMgja9yyeG1vrzd2oycmlTePWhrrKZlGQuaN1VvYU6S2d+
+nfWICTKt6KRnAVx7skvdCM4+qqW/hv4GCkXKxVCBU3393f/Nx9H9cA7LDCHPriv3
+QpE4cq+FI6Hz/+wzdGMC57PVKEKQjopgdho6/Vx2Lm78c9wl03vvAspbHKAuM7p2
+BZ3clJi0RN7riG8Etk1dS1pfFOdzrmZRNkI/1Rs+ny7+vw/D9yUbIC+hAA7zeMw=
+=vMV4
 -----END PGP SIGNATURE-----
diff --git a/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild b/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..aaf054766518
--- /dev/null
+++ b/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/vimprobable2-1.4.2-r1.ebuild,v 1.1 2014/07/19 04:53:56 radhermit Exp $
+
+EAPI=5
+inherit toolchain-funcs savedconfig
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
+	EGIT_PROJECT="vimprobable"
+else
+	SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}
+fi
+
+DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
+HOMEPAGE="http://www.vimprobable.org/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CC
+	restore_config config.h keymap.h
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1 vimprobablerc.5
+
+	save_config config.h keymap.h
+}
diff --git a/www-client/vimprobable2/vimprobable2-9999.ebuild b/www-client/vimprobable2/vimprobable2-9999.ebuild
index 7ce232db7586..a50e5f9da8df 100644
--- a/www-client/vimprobable2/vimprobable2-9999.ebuild
+++ b/www-client/vimprobable2/vimprobable2-9999.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/vimprobable2-9999.ebuild,v 1.3 2013/05/26 09:53:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/vimprobable2/vimprobable2-9999.ebuild,v 1.4 2014/07/19 04:53:56 radhermit Exp $
 
 EAPI=5
+inherit toolchain-funcs savedconfig
 
-inherit toolchain-funcs git-2
-
-EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
-EGIT_PROJECT="vimprobable"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.code.sf.net/p/vimprobable/code"
+else
+	SRC_URI="mirror://sourceforge/vimprobable/${PN}_${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN}
+fi
 
 DESCRIPTION="A minimal web browser that behaves like the Vimperator plugin for Firefox"
 HOMEPAGE="http://www.vimprobable.org/"
@@ -23,13 +28,14 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	tc-export CC
+	restore_config config.h keymap.h
 }
 
 src_install() {
 	dobin ${PN}
 	doman ${PN}.1 vimprobablerc.5
+
+	save_config config.h keymap.h
 }