bump one remove one

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index acf9229e7e4a14795296a506f561a310772ade1b..2a70a7002337bb6c277972930a8d25cf15ba87a0 100644 (file)
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sqlobject
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.60 2015/02/28 08:21:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.61 2015/03/26 04:46:04 idella4 Exp $
+
+*sqlobject-2.1.1 (26 Mar 2015)
+
+  26 Mar 2015; Ian Delaney <idella4@gentoo.org> +sqlobject-2.1.1.ebuild,
+  -sqlobject-1.6.0.ebuild:
+  bump one remove one
 
 *sqlobject-2.1.0 (28 Feb 2015)
 

diff --git a/dev-python/sqlobject/Manifest b/dev-python/sqlobject/Manifest
index 4b705e5fed09be612f54c2754db21cc28d657e90..bbb9fd03daa24e624f9c7d4b12e67205f676f004 100644 (file)
--- a/dev-python/sqlobject/Manifest
+++ b/dev-python/sqlobject/Manifest
@@ -1,8 +1,18 @@
-DIST SQLObject-1.6.0.tar.gz 276441 SHA256 7299dc568d074ea8cb418bf3ad64a5ed380ae6c18be381519ead6c6a2e578b95 SHA512 b3e9d58027f0de2847e6f30516fb153a871284b23aa033089f07e6351be3953e9d8de46091245db3f34aa2a1aeef0a4f2ae252de5b21d9788f72fd7513459731 WHIRLPOOL cb33c3663b9552892613bcdbfde170d1839e8593ea6ff1891dce31ecdc13750390717c53260863c39cc21bf3e171fa6f8b2de8c7d1a572a9a071f80b9987da4b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST SQLObject-2.0.0.tar.gz 885752 SHA256 07246e9888736a0486e44d8254bf83f5d11a4588aa7fddbd1340eaa94f0561ff SHA512 3a439c1ebf6b30fd1589fca1d45e0e4aafcf279d80a96f56ec4a9ca759fcaca95ac3a828027a3c84938cf50c4b5a1c3560ba680086af7df85af20694bb74e1ee WHIRLPOOL aad14cf9a7c1c422816fc99e2b954d8bed49a1c4ac7d9a3d1b1a2692f5704e555a5bfeefdeaecabf18f520d6aee597484f1380c500bdabd8a3ffeb35de4d72df
 DIST SQLObject-2.1.0.tar.gz 886819 SHA256 7c3b996592a0ed88359ec11fd6668e46874ae030b5903d7b2364d48f2758c4cc SHA512 9129abda2310620819f07de9b32a94be172fa371d5f20e550f3dd5ba777554e3d562101c8014e4332d427a7df22f1ffef55c0cc1a889bda7f7196e9bacf436b5 WHIRLPOOL 2b98838d96ee0ba1189b96456689782612fb4ca0d6de6a752316081b5d15a8f3c3356c1152852bd2560e45f3ef19d3b21e608b535042c4d5b92a37852f7cd0cd
-EBUILD sqlobject-1.6.0.ebuild 1225 SHA256 6253aa0e31f00ca100b8ff2a2960533a680390ec4cf0da6db0758e57ac04288d SHA512 2246a4e57a502351d41671d71981be464a8ca01230fc6ac2706c235b54e9c89cc8db38790ba4e1ae24a59dd1c23649e46af92dc7a234bf182f0c77255b5366e3 WHIRLPOOL cf5089b5eb1b9e221d70aa801389bcd17b144b77f4acab4df3ca0d12c434c66322dff24d0cc73a1961732a0bbeb3936888b6be898a65e0b202122398f211cb4c
+DIST SQLObject-2.1.1.tar.gz 888532 SHA256 35675d9c6c5a373b68c1e597a51c2723e1a8471911f89b7ec9ab3cc380064874 SHA512 9f51452afb728b3eaa0b113aca7086af6cd858d3b6e84c557af56a086d9a04c7e061f1b45179d0c74ef6a175e593376e1ea3ce561a337d71df6eea0f7bd09fee WHIRLPOOL 0526d02b1815281724b1c5ad1fadf16a5dc3e765bb6c9e6b59db83e95a1f3bfa20134acad459e19583694739a38b3dece3bdc328ad7f57f09c95094759143a50
 EBUILD sqlobject-2.0.0.ebuild 1110 SHA256 6cfa42ef53622c64f1bd2e5ee09d0000e35b341d90712e5caac814f025f72f9a SHA512 11d7aea2a1b874af3885bedf2593b4802729ae61ac8c8a51abbde7b8863e2a76e1dcdc017e92f400f455a929b9673ad0279179cab68fe318afff92f68dd27716 WHIRLPOOL f6c164f31e600cb462f31627d86c2caf9461882c82a7af9f68d9e1969777c017a180d2c60e3faf4c57278de0f4d3c928eedb21105c8108a1bf3d926e1141dbdb
 EBUILD sqlobject-2.1.0.ebuild 1110 SHA256 9d8617af36cdbc3e00b75b666e103360af4b6534f25bb48572241706e05d21c7 SHA512 65b67a3d6943db9b0791d04bda07dad57b32607b2d032d15be2d668cad51aa293270604a3a001fdab9348c1f53f44d5522321e61b9c85613f09db79c316c391d WHIRLPOOL 34667a7bce3444fd60213dd89c419ad5b6ef54e13bc3358ae681ed3be8b56b6d9fa63123692159e2c4ced73982d1084a6ee7b538d87397d6a33d4a2e3e9b7278
-MISC ChangeLog 9913 SHA256 66dc0aca33685a81fbd6280650b43e65857ab0b5ae1ba92f2dcda94b873ee155 SHA512 dd1c9b79fa034a9252352a5b65085a5bc6ffa1587b2f55e280bd2578f9bfcc8684525aef5487a9062ab97b179a924da0f1d4c45ffecc859e9fbbd1cde46a3c9c WHIRLPOOL f31c52957d492d433e798d8b783729bc779db1fd3a716c84ba109eb166915d5a8ee367379edae733a1cc4e138230345e117b80c82b2824e12ce37558ecfa2ee3
+EBUILD sqlobject-2.1.1.ebuild 1110 SHA256 a79edd05a070b7de734aa9fadae4f3b7e73e38e91f4d017e02a9c273ac626f9b SHA512 6719208ecb71dd61b0e5043904b835f2f9731b509083a52964c5fdfa5f3456436ad9a1c4878437bf72423c428e2ebd679a6694ccce7739493fa32567586c784c WHIRLPOOL 3f12f3ab7ccd577bb99f5fc1a9a08f9744d96cc62643c9693f2d555909b59c2041d895bd9e55927c0ba021851a4a6083781777db708373270b0cc939ca27fd78
+MISC ChangeLog 10068 SHA256 86297a359862f114b8fc678d39a1ff96e5965ab6a9211c03533069f6831e3e39 SHA512 e233077626896397f8c672a0a7bf3a091d0b98e05369c6a86763efd627d3d940511514d98fe1afb357ce8322999770e2ceea7acdefe70aa7be8dd874f66ad974 WHIRLPOOL f0942213b4b5424c00befe6e5e914a06793c72fd203177608130226df7c31051c89d7e781e3854bc3f2c6307514595ade0fc2db9f3e670fc7e356c2c2ae42a90
 MISC metadata.xml 740 SHA256 4d98f9f9734633a4c4d9109a35e13c5be3ad6765242d05cbb26ab4b0d78a7b3b SHA512 656ffd1a467cb72e365d76ad517e0fa792599c1f1993e78adf63f1090af95bba6ddc317e4d3353e4f999d5d410acf86d099b1d629ad3442fa2f856b40660079c WHIRLPOOL 9857cb5266b762403706b33d33fd67a5fada9f6a99a805cd7ac79ccce8692afff980adf11dca808f5e68ce4c185fa05089f5bcea04c24fa23777ef9b74d9731f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlUTjx0ACgkQso7CE7gHKw2TgQCgxy4YFm6OqSTDSyzQPB1c4vqG
+ZEQAn2vET65mGt6/O/ZQL0SXFrds79tF
+=NYQp
+-----END PGP SIGNATURE-----

diff --git a/dev-python/sqlobject/sqlobject-1.6.0.ebuild b/dev-python/sqlobject/sqlobject-2.1.1.ebuild
similarity index 68%
rename from dev-python/sqlobject/sqlobject-1.6.0.ebuild
rename to dev-python/sqlobject/sqlobject-2.1.1.ebuild
index 4ead3944c65038b1ed7d7d631411fbacc39fdf86..eb41f633ce7e079be694b065642b4fcfe70bfcee 100644 (file)
--- a/dev-python/sqlobject/sqlobject-1.6.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-2.1.1.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/dev-python/sqlobject/sqlobject-1.6.0.ebuild,v 1.2 2015/01/02 23:00:16 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-2.1.1.ebuild,v 1.1 2015/03/26 04:46:04 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,21 +20,18 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-
 IUSE="doc mysql postgres sqlite"
 
 RDEPEND=">=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
-               mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-               postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-               dev-python/setuptools[${PYTHON_USEDEP}]"
+       mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+       postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
 python_install_all() {
        if use doc; then
-               pushd docs
-               dodoc *.txt || die "dodoc failed"
-               dohtml -r presentation-2004-11 || die "dohtml failed"
+               HTML_DOCS=( docs/html/. )
                insinto /usr/share/doc/${PF}
-               doins -r europython || die "doins failed"
-               popd
+               doins -r docs/europython
        fi
+
        distutils-r1_python_install_all
 }