From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 298B31384B4 for ; Fri, 6 Nov 2015 11:55:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 809A5E07DD; Fri, 6 Nov 2015 11:55:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11F61E07DD for ; Fri, 6 Nov 2015 11:55:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C83DC33E01A for ; Fri, 6 Nov 2015 11:55:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B97621F0 for ; Fri, 6 Nov 2015 11:55:10 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1446810893.05924a50b43e67b7edf93b07c8d750a0e7f66286.fordfrog@gentoo> Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/ X-VCS-Repository: dev/fordfrog X-VCS-Files: dev-java/netbeans-nb/Manifest dev-java/netbeans-nb/netbeans-nb-8.1.ebuild dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild X-VCS-Directories: dev-java/netbeans-nb/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 05924a50b43e67b7edf93b07c8d750a0e7f66286 X-VCS-Branch: master Date: Fri, 6 Nov 2015 11:55:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11d481c9-f189-44bc-aca9-c07b17192bde X-Archives-Hash: 01414d9643f8314fcb2be352232d9a0f commit: 05924a50b43e67b7edf93b07c8d750a0e7f66286 Author: Miroslav Šulc gentoo org> AuthorDate: Fri Nov 6 11:54:53 2015 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Nov 6 11:54:53 2015 +0000 URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=05924a50 dev-java/netbeans-nb: drop keychain support from version 8.1 and 9999 Package-Manager: portage-2.2.24 dev-java/netbeans-nb/Manifest | 4 ++-- dev-java/netbeans-nb/netbeans-nb-8.1.ebuild | 24 ++-------------------- .../netbeans-nb/netbeans-nb-9999_p20151105.ebuild | 24 ++-------------------- 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest index ca4d655..0464f4f 100644 --- a/dev-java/netbeans-nb/Manifest +++ b/dev-java/netbeans-nb/Manifest @@ -30,7 +30,7 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507 DIST netbeans-trunk-nightly-201511050002-src.zip 208737487 SHA256 86f4bd2b25363a6893ae9ec91352e93be7d6d707b8d4d0c573ab6634554499c2 SHA512 50d06f779cfdd7bbbffb91844010e93f94339c505e38b3af7a9066bc9f4a35db6dcbc8a9737e436904ea1bc18267e6139656f8dc1a82356d9b48ab442f420ec0 WHIRLPOOL 05c392e0151f0348dd5d51796262f503c312b73a4166b92d24a9598f490da6567e8b76c52ab7cefb957b34e3e0622b3e5cc3888e3a9c6cb88a18a1e917b95314 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca -EBUILD netbeans-nb-8.1.ebuild 4951 SHA256 fde1bc0f944e6b27d9f9753887846095e3bf4f51d708b52f9ef000f454905720 SHA512 2ac9ffa8b3f0b2b080a5f4ae20eeea3b0d0b1ceee756626e54c6750ebaddb04de46d5d11c57f312dbe7ec8ad3dcaeb113af0b35727c3da5e2305aad7d58d8384 WHIRLPOOL 76cb1d53ff396abcfeb536ff1fef5c301dcad2840526ac9ce6796250b2c348b7d280d56ba53d60b3d2a9bfe9fd431d1ea6014d4ebe28b79b1199564af0fa1765 +EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12 EBUILD netbeans-nb-8.1_rc2.ebuild 4952 SHA256 7e7fd653bb309c4acbc812e3e4659e0f3f67f943ceaebfdea0e9ff75c2e71174 SHA512 59da938007782e139e0946ef8da1fcb49d2d6d993953222cd2540b0506981279c0f3ad6b9ccaba89af185f4fc9eb7ed23ec16e66c066c22541fe371384eab59b WHIRLPOOL 2be8f9f9cc42829865f393f4a641b73053d460da5c3bbe45bdf470ffd0c519e76af9e4712f0142d0c018801d003c347bcfb4fa99ff1e3a95bfebe8f1e0f02f2d EBUILD netbeans-nb-9999_p20151003.ebuild 4997 SHA256 4a3f76f876ef86def5c520bfe25862b967c4a1541afe3482249606b3f25bf834 SHA512 8b7394269188b4ca4fc3ae1c57b8433d1fcbecfec83a65ce24784f15677417c9023a290e13c2815bed8366d9059aaa958e3e8010a0a5c54e1ba6dcae2991babe WHIRLPOOL dfd1bc86f95779e9a8f0058838a3566153b42095f3c4fac7763eccbab6fee0612053c3becb53d01d4000c314a4299c17653e816007a1b51d262e6b39409b9e47 EBUILD netbeans-nb-9999_p20151004.ebuild 4997 SHA256 fa04d92fff6adbd9130da20623b7543a8688e6049499d626893c89f13c71f35e SHA512 f402582e19c0dea600d2bb222f9aca62671b7a66f8a480a689a70cf0472ced8097a3a9ecdefcefac34c5c03c5e75d56cb6ce1525d347e649559412aa3b5ada72 WHIRLPOOL 7b8dd62345302e778b93a9e27bfadbc8eb559f905362165b9f3c1929141690f521d87dc7d5e783d3fabaa63d0b87cf7d0feee9a47db05277c9723c50cdfa4ba0 @@ -53,5 +53,5 @@ EBUILD netbeans-nb-9999_p20151027.ebuild 4997 SHA256 11d39ce8dcb6e465c843c74367a EBUILD netbeans-nb-9999_p20151028.ebuild 4997 SHA256 245af016e2976230fc5ede4b16fb09a9fa7ee451498129cb5b06ac97254bcb73 SHA512 1594eb2bb3f6a00938fcca94a7a858681e9d7c263fe95eca8452b6c01c19d1061a0e3e2b69997ae46418d32dccf8dd5278bbc181666910188276000bd618de68 WHIRLPOOL 6b9446734a7c36570a32eb14ac4241a0fdb22fa23ad932c4a5419f09c62538eb6ff15f218804b28466ff107f574a50c708ce23d19800b27f325b0ae319941842 EBUILD netbeans-nb-9999_p20151101.ebuild 4997 SHA256 9c42522f7debe07d0511b8127fcd144fee5acb66fc17888eed697d0723e4ebf1 SHA512 6c34b949c1b8e6c7263fa5c463e43bdedd832d4ff0e82272da4d53f6971a82fc086869309332757a44ac25e68909392b1a37f270bd389cb089418679e133f34c WHIRLPOOL 2ed2078031e3cfb031eb6a06536835269b3dd568740cd083b4bbaee92d1f70c60a795d143c4e6b9e271eea1a023e249732b03c97fbab9af876b7175fced04139 EBUILD netbeans-nb-9999_p20151103.ebuild 4997 SHA256 f19461c82960da3ede496a20f8f79d8f51943b10e1fb16e9cfde899aae4c3e38 SHA512 1b2404a0ef3d847b69fe8e667c8474fdb6a34b114141b2a63c9243c53f7bf622413b3e54047e4612bc9832dfad141aa0aa134dbd5e4afc07f70b2e52d69a51d9 WHIRLPOOL cb1390a21f8cc3c29c3d1c5c95bdc1a4dc2e22344ed8b4458b4654201c9f8fc68932dbb1b443e24b9fe9c13c2bc711126b184f79536d4c6d88b35f802e502152 -EBUILD netbeans-nb-9999_p20151105.ebuild 4997 SHA256 7e614b589c158239eaeae48c7d8c361395ceff6b934b68643061149bd6b16631 SHA512 b09e5493a0c6c054e314c06876575f629643fc2dbbc658564d0c9ecb09e2bb99c93cd03c154e669fcb0f6529e04cf70e376aa3a5fd8683c8ad6eac7559939abb WHIRLPOOL 5814edd97e4d3de43d9aea9597778b872566e10251489fad93c8f9eccb33b1c4ab30abe95bba6fc7778bb4c25a8691fecbd275cad8fce49bbbd9068747d2851a +EBUILD netbeans-nb-9999_p20151105.ebuild 4111 SHA256 c7295376c78f8ee438a5f3cccfa0fc771778d7af1dd62c32fe8d7b850b39694c SHA512 cc36c1f65772bec2f563188fcbffd98f6a4d5609baf5a201ab6f50e62d03f101a36e06165162fbeb6d6684fb22017e8110da5a0a2b0e15038daf21e2b9f96fe1 WHIRLPOOL e485a6ef921cf6edcb122816176384e35968b1af523289fd1aa88883982fda51cdfb24586a4ae33359259f1854c296c228da0018dcd41256143d80c05a2dc36c MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7 diff --git a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild index 3a796bb..ab6b3b9 100644 --- a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild +++ b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL} http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png" LICENSE="|| ( CDDL GPL-2-with-linking-exception )" KEYWORDS="~amd64 ~x86" -IUSE="keychain" +IUSE="" S="${WORKDIR}" CDEPEND="~dev-java/netbeans-platform-${PV} @@ -25,11 +25,7 @@ DEPEND=">=virtual/jdk-1.7 ${CDEPEND} dev-java/javahelp:0" RDEPEND=">=virtual/jdk-1.7 - ${CDEPEND} - keychain? ( - net-misc/keychain:0 - net-misc/x11-ssh-askpass:0 - )" + ${CDEPEND}" INSTALL_DIR="/usr/share/${PN}-${SLOT}" @@ -53,7 +49,6 @@ src_prepare() { find -name "*.class" -type f | xargs rm -vf epatch netbeans-8.1-build.xml.patch - use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch # Support for custom patches if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then @@ -131,18 +126,3 @@ src_install() { mkdir -p "${D}"/${INSTALL_DIR}/nb/config || die echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die } - -pkg_postinst() { - if use keychain ; then - einfo "You enabled keychain support, that means NetBeans will use keychain for managing" - einfo "your keys while connecting to ssh protected repositories. If you want to load some" - einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir" - einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file," - einfo "each key on single line, for example:" - einfo "id_dsa" - einfo "id_dsa_gentoo" - einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked" - einfo "for key password (only this time and never again). You can find more information" - einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain" - fi -} diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild index 04ff1e2..adb46dc 100644 --- a/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild +++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild @@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL} http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png" LICENSE="|| ( CDDL GPL-2-with-linking-exception )" KEYWORDS="~amd64 ~x86" -IUSE="keychain" +IUSE="" S="${WORKDIR}" CDEPEND="~dev-java/netbeans-platform-${PV} @@ -25,11 +25,7 @@ DEPEND=">=virtual/jdk-1.7 ${CDEPEND} dev-java/javahelp:0" RDEPEND=">=virtual/jdk-1.7 - ${CDEPEND} - keychain? ( - net-misc/keychain:0 - net-misc/x11-ssh-askpass:0 - )" + ${CDEPEND}" INSTALL_DIR="/usr/share/${PN}-${SLOT}" @@ -53,7 +49,6 @@ src_prepare() { find -name "*.class" -type f | xargs rm -vf epatch netbeans-9999-r14-build.xml.patch - use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch # Support for custom patches if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then @@ -131,18 +126,3 @@ src_install() { mkdir -p "${D}"/${INSTALL_DIR}/nb/config || die echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die } - -pkg_postinst() { - if use keychain ; then - einfo "You enabled keychain support, that means NetBeans will use keychain for managing" - einfo "your keys while connecting to ssh protected repositories. If you want to load some" - einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir" - einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file," - einfo "each key on single line, for example:" - einfo "id_dsa" - einfo "id_dsa_gentoo" - einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked" - einfo "for key password (only this time and never again). You can find more information" - einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain" - fi -}