From 40b8e95da2d6080fb1c874eb95d4fa22020a5819 Mon Sep 17 00:00:00 2001 From: Devan Franchini Date: Sun, 28 Dec 2014 01:55:56 +0000 Subject: [PATCH] Adds patch to source functions.sh from /lib/gentoo, bug #504132 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA8C8FBCF --- app-admin/webapp-config/ChangeLog | 9 ++++++- app-admin/webapp-config/Manifest | 15 +++++++---- ...-sources-function.sh-from-lib-gentoo.patch | 25 +++++++++++++++++++ ...53.ebuild => webapp-config-1.53-r1.ebuild} | 6 ++++- 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch rename app-admin/webapp-config/{webapp-config-1.53.ebuild => webapp-config-1.53-r1.ebuild} (91%) diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog index 2cdbf3b14b80..e4f5d8284e3f 100644 --- a/app-admin/webapp-config/ChangeLog +++ b/app-admin/webapp-config/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/webapp-config # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.116 2014/11/26 07:06:31 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.117 2014/12/28 01:55:44 twitch153 Exp $ + +*webapp-config-1.53-r1 (28 Dec 2014) + + 28 Dec 2014; Devan Franchini + +files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch, + +webapp-config-1.53-r1.ebuild, -webapp-config-1.53.ebuild: + Adds patch to source functions.sh from /lib/gentoo, bug #504132 26 Nov 2014; Ian Delaney webapp-config-1.53.ebuild: clean old python impls diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest index 6355795404f0..827344e1742f 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -9,17 +9,22 @@ AUX webapp-config-1.50.16-htdocs-symlink.patch 509 SHA256 24e48a42f2b08010ad25f5 AUX webapp-config-1.50.16-update-servers.patch 2565 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7 SHA512 d6d37ab12a7b9592a2394b89981bfd183c1d5050866eecc9277c638f87bbae9942d822e1ed2dd856b2a4f5e0319d84ff47f8b7caf480449847599be04bcf9648 WHIRLPOOL b219c1a016e37a1c7ca140d5ea4a82075f4eebf8f57900d6ed8e964ff19aa23a35641abf8be2b5f209937b3cc100bf791968b6d392337cb906e927b1fd564332 AUX webapp-config-1.51-fix-indentation.patch 820 SHA256 ba492885bdcb0263152a727f0ab790873a29208491573c02bb432d92930d82f1 SHA512 7a07df87a8304e2154b9a03dd4eb648eaadd4be8db70adf3c9c80fb46f2652b6ed67454ccfe64bec37d576f088eac88b829e33a81879dca06b6f9ded02587e3c WHIRLPOOL fa1b0a8dc72ecd7757a2dcb0ba2cc5d56611d10914c231a98871aa3873a0a559fe30724113a298b235ea6a4f0143198c0b4367d973db1c0f03be45c69df01324 AUX webapp-config-1.52-nulls-doctest.patch 9054 SHA256 d29b81b0c5836e0258a5cf6f3f6e44b92a861e5f181c6acb7f2c3d897fe9a997 SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f WHIRLPOOL bfa1728d72bba541f516263118d4cf3233b64d41ece32380c8096f33e08f6a6d102496982da95417391cfdd2f9a6d0add33a1ac683251e89b46e431fc49f8c2c +AUX webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch 756 SHA256 83ad478f41ee6a6035a5c3d492129cee8dc28ce068216ca36db8e7ce323e04b9 SHA512 e67f8e055bd0af7b97eade6dfce40fac411374dc264952ef1f17ffb5a161eed015bbbee512e83e1b533cef352c7dc863a96fa2345ecedaaa72352ddb622b820d WHIRLPOOL 13f4d1462456d6dd6097fe36a537a931a751056ca5e9281cd2e7476311cbe4ce776305532d876bacf86f95b137d61d3d2691d624c75fa61d4d78ea8476371fee DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc EBUILD webapp-config-1.52-r1.ebuild 1746 SHA256 a840cc430e2b3cf9102118c994f30e6d947663ece2ba5c337e7fb45ab8c74bbf SHA512 164e59e0c27236b093e3c346a3289c37ea0e958ae50c3fe7142e8e48be733179b85ece4166884f3d679612c048bcc96ba3c5692916ac2d48a53d923e7fa266f6 WHIRLPOOL 09fb2cfb75813de9bab227c4ab1a6ef2343f134ae071620e4b36ffcb07d235a061f837a75857333f47bbd2a91199db9f789357b8181d96c988bd970e6caf19c3 -EBUILD webapp-config-1.53.ebuild 1674 SHA256 38e1c32ea946823608586196c71c8af1673322062b21ef795c434615621b412f SHA512 197ff2b497cad16d74614b64734c99d31362caac73d1f6e8fbd5ed0eb61671b65b4d2d1ee7bfeb7cc8ab7a8de66c07c54163d04624974dada0da28c291b4cf8b WHIRLPOOL e742086e6d5708445effee01fa3908f35b014cd7467f61c37451620004650c0fdbc449a5897cc9b3772c947d05048064d85e216f4c7e3c013751377e2234901b +EBUILD webapp-config-1.53-r1.ebuild 1770 SHA256 c43a09c7b98b2e8e40b7bc849b607a8a5585d730483f04d2bb90f9cd8d6ee28a SHA512 3c110abe48e8a1a55820fd8af1b380b0d2f27a73826d12b18a2b077c8004bf9c6c869e87e0a955ade0df7b22fed7cde66c33d401501f1b3f989d6fa30c704116 WHIRLPOOL f664a80168e049682015a912fddefbd9e148466fe6a60b33df797b1e0a9c25a3e40f7897fa54e6d46debbef3ed9fee3de09e4052f8537606da318404e9a8f088 EBUILD webapp-config-9999.ebuild 1818 SHA256 0dd52b62b5f0b3a0f495434317c65e4a7a15a4e669b79a6e79f55f6fb7a67860 SHA512 b2b0a5ec1826fe7cb24f2041f58f9118b2f6e0dab15f3b092446319e91ebd6770029d14a06adb30d2669b44afd3778c5a44f5c092c4a63072994b0f1603582e2 WHIRLPOOL 15d70a19e84285bf89e22ce9bf52b6f70639e79526c7aebba01b0267ac1331594b7a919fba4d11c3a4377d3cf8be6efa2b287e7a6fa19efe9fc752f52c9f5c3c -MISC ChangeLog 30788 SHA256 2e5ebe37879243841f6b6c563aef49d98aa8ebee2fbc55724120733775d4c1ff SHA512 427e9b848194fb3a2dc92b2c477fc5bb0d4eb51f50aedc6166d48093c5122df8bbba5392ca6383573a0b51425efc7fd5bb67e28faab3f7adc6d33d56479c1c2b WHIRLPOOL 7137e9d0fc85dd3be60f261e21982c453d70d7e3f4fdcf1fc757a5402699bc8b04fc69ffa7af7ce32b81f2de758f3e4d079f1ba5d5718b21d8f576d2a8148bf7 +MISC ChangeLog 31081 SHA256 84defa8f20d7c630d3eea5a5cceff082734f7d0cf5e17655a12770dcf0ac4e8f SHA512 ddadd4d0133e685cb1e30d14804601dacb83fe74dabb928afdbfc5da4baaa5a8b33a57d60466ecc77b2c7d9f283a38d1ed847a0eea7f0559de68c90386cca9b8 WHIRLPOOL 159654b174a19cafc4998a21c857b30560f576ed03f30234db2216525f57f7f188b84cfc1af058174efaa9bd77b60854dc1b31d303184eead8112f08906c49d9 MISC metadata.xml 462 SHA256 c8bfbdf08140c41fd24a684e7e9642298dde3060c52054768f77a53ec78e125e SHA512 82fa9c21e551dab1bf71ee7ef2cf7ddf3bad6b3478a3701c2e90eaf06175f13d6b0965f163a2f30993ee6be582d9044cf947777c25b077f8424bcc09a96cb117 WHIRLPOOL 2e3efe5f154cbc0b68ad51da216b0bca2e2ce06d92c10166d8ec04b71ec63b532f8237c4d35cf1532e6a15fa41d3731147c05c46e036a14aceff58e3b5da85b5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR1fAcACgkQso7CE7gHKw12zQCfYEx8h5myLxjq7T/cs0suYWrs -HCUAn36DMsgdzaGogOGvnvrqZWrMZr0E -=jP7A +iQEcBAEBCAAGBQJUn2MpAAoJEOf5eU+oyPvPaFMH/18VlcbOdLPlah+3ekFML1g7 +auf4Ec7FshKYfcOyZg4wlmwp7Upe9naWdhum0anZG3MEsS+GxSgdCfWdZjF+cPXe +lH4A2ESOTUAwitfP7hFJHvopDjuHuFKSxavp5hnLNDjTKCWny6+vHi6sfKYiXHu1 +qR5KtV4Re+nnx8trS2QsP9C4+ADE6d5W/s0TSzVL24W4/oifFkC+xyartL3yqOs5 +BWfCk4S8cdxCChI7AkIaFUuUaGeORDXzNmPPoBQsEK52oAB2PbO7Rn6qhvO/w+FZ +0kLXdVFWscPvoMYovEGzX78eAzeQxIHTPs2PeHBLyBKW9HEy9225DX/bmAPHg3Q= +=Mdbv -----END PGP SIGNATURE----- diff --git a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch new file mode 100644 index 000000000000..06a924a426be --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch @@ -0,0 +1,25 @@ +From ff7ba0d89c79584f14a8137d886a656a9af6de5c Mon Sep 17 00:00:00 2001 +From: Devan Franchini +Date: Sat, 27 Dec 2014 20:43:08 -0500 +Subject: [PATCH] webapp-cleaner: sources function.sh from /lib/gentoo + +--- + sbin/webapp-cleaner | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner +index bfec623..52e44ac 100755 +--- a/sbin/webapp-cleaner ++++ b/sbin/webapp-cleaner +@@ -13,7 +13,7 @@ CMD="emerge -Cav" + WEBAPP_DIR="/usr/share/webapps" + WEBAPP_CONFIG= + +-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh ++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh + + function help() { + echo "Remove obsolete and unused versions of web applications" +-- +2.0.5 + diff --git a/app-admin/webapp-config/webapp-config-1.53.ebuild b/app-admin/webapp-config/webapp-config-1.53-r1.ebuild similarity index 91% rename from app-admin/webapp-config/webapp-config-1.53.ebuild rename to app-admin/webapp-config/webapp-config-1.53-r1.ebuild index 75fdddc8a3f7..91bac21b4f01 100644 --- a/app-admin/webapp-config/webapp-config-1.53.ebuild +++ b/app-admin/webapp-config/webapp-config-1.53-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53.ebuild,v 1.5 2014/11/26 07:06:31 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53-r1.ebuild,v 1.1 2014/12/28 01:55:44 twitch153 Exp $ EAPI="5" @@ -22,6 +22,10 @@ DEPEND="app-text/xmlto !dev-python/configparser" RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +python_prepare() { + epatch "${FILESDIR}/${P}-sources-function.sh-from-lib-gentoo.patch" +} + python_compile_all() { emake -C doc/ } -- 2.26.2