From 00af41e4d7e55c695b4bae8c785e4b96963fc350 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 8 Jan 2014 22:05:04 +0100 Subject: [PATCH] Bump Package-Manager: portage-2.2.7 RepoMan-Options: --force --- net-im/jitsi/ChangeLog | 9 +- net-im/jitsi/Manifest | 10 +-- net-im/jitsi/jitsi-2.0.4506.10553.ebuild | 65 -------------- net-im/jitsi/jitsi-2.2.4603.9615.ebuild | 90 ------------------- ...-2.3.4789.ebuild => jitsi-2.4.4997.ebuild} | 5 +- 5 files changed, 14 insertions(+), 165 deletions(-) delete mode 100644 net-im/jitsi/jitsi-2.0.4506.10553.ebuild delete mode 100644 net-im/jitsi/jitsi-2.2.4603.9615.ebuild rename net-im/jitsi/{jitsi-2.3.4789.ebuild => jitsi-2.4.4997.ebuild} (93%) diff --git a/net-im/jitsi/ChangeLog b/net-im/jitsi/ChangeLog index 9bf78351..3e3267ba 100644 --- a/net-im/jitsi/ChangeLog +++ b/net-im/jitsi/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for net-im/jitsi -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*jitsi-2.4.4997 (08 Jan 2014) + + 08 Jan 2014; Mario Fetka +jitsi-2.4.4997.ebuild, + -jitsi-2.0.4506.10553.ebuild, -jitsi-2.2.4603.9615.ebuild, + -jitsi-2.3.4789.ebuild: + Bump + *jitsi-2.2.4603.9615 (10 Aug 2013) *jitsi-2.3.4789 (10 Aug 2013) diff --git a/net-im/jitsi/Manifest b/net-im/jitsi/Manifest index b5210743..d7f71006 100644 --- a/net-im/jitsi/Manifest +++ b/net-im/jitsi/Manifest @@ -1,9 +1,5 @@ AUX jitsi 1295 SHA256 883788ffe84e327fabbe63ab3d26cd8d3a245c41100d8655e346c01909f07fb4 SHA512 8aa9c49c479432ac4cc93854df307e19f18651e1ef54128a0f5a590e8c12e216ecf99d04cef0f36d8acae000dd761b70650aa9d7e29401627c29a9f97cb2c462 WHIRLPOOL 235609996f80412ea3edb03a53f92d773f0b3c1a6d48ac69ca43096533162dd6453dc0ffe80d67118e2414bd949ec1735828d89653b0773b0d9c03960b1eed9a AUX jitsi-2.3 1250 SHA256 439b05f184ae20b807b1828fcd648739f57e1adb353fa4fb54d5cbc1e722c19a SHA512 4245a333ebb4c11d335ed941a6a175bf6a4951d306300011e8de21782c2f19547bcc74a2834ceda3d825c99a2c41fbe2704537d534dc7771ff8a55f0548a96a7 WHIRLPOOL 66206eb34b0c4253cfc5b35b688fbd2bcf20e94446d6b354a8b58cc657ba8dc0f1e72d7d92991d8b8a8a197185675b1917cf76e672930d90c772724c8edab5a9 -DIST jitsi-src-2.0.4506.10553.zip 61187301 SHA256 939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d SHA512 b29a6f2af3208e60fcb6f09a7a543a86df521b1bd02c836c3eb5e10bee92a69721a0ccd45e92e035c39d3d632cef14b1fa15e535520b6b253e09107979453564 WHIRLPOOL 65f96e047ab5398cc2359e51ca6b918aff657af0755c2bc7a0d808b38260acb0fd9f93adb7dd6b046ca3782e5a72388a9783077d4a10824b0dd8463166a12f6b -DIST jitsi-src-2.2.4603.9615.zip 61195867 SHA256 6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41 SHA512 ec071eed32a1ac7b1b93944f41d6fc97ea39651100cc55d880da56cec2eecb0cd442284968a6e11dc824f13201a8b41909afd18c492d4808f44b357f4a3b05e2 WHIRLPOOL 4b2fb07b7ad76bfa2e31934b00244f2a36e8dc0be380134bafb7ccfd1eb6db602b005d2943f2a5b732e253f3dabfc6c640f680011feb5fa5c0ae7a2fcec1362f -DIST jitsi-src-2.3.4789.zip 63718190 SHA256 981db1aba58742c9bca12c05db50a51e4d2228e0f8fa11fe243f7bd626887309 SHA512 0ed1f42e7b0745242f644b9351636d24722799bf38a6c18c09d9ba322e5f4c28390bc43c8a19eab1751ecbb969b064a60d7664b6400a70c16c17b6d5b3a42c0a WHIRLPOOL 3a2158870ade8088d3e744d8345160e888774b7bf499166dc5444134caf09b6ea3401c0040277de5e3c99dd5e768ad4c84f4f0ba1d6e58fb886f031e65a1ee16 -EBUILD jitsi-2.0.4506.10553.ebuild 1943 SHA256 a82f165242d00ca03f2cc418094c9d7cf73ea128c6b98d585a688fbc7f0942a3 SHA512 cb24ba75cd8fab453bf7ff916915d9f6213dfe766a2c8990e184067d66e2319d7a1844a77088e30ae685982f2a9944f0def526322a2f5420dd5fca46ecda012b WHIRLPOOL 8743185aaef02ec0c57031dec50cb15f291d56153804b495902023c62cf20c0675d8c98caf77b9a44cafe4db62e7587aa4db3fc13f7e050b92f18ed85e0e1a51 -EBUILD jitsi-2.2.4603.9615.ebuild 2639 SHA256 2bc739d7f6bd6e882677948413fc1621fbc368611e82134febd119a621001822 SHA512 a4371a0d454d75d3bbc73245d10dcec4729f15d22f1f5c9c677ba2dd64633fb9169e16f2b1cbb621fc4b833ea5594bdfd9611bf0d81313fcd5d42492710092d6 WHIRLPOOL 7af64f6378167ff6906f22819291e5e3ba2b44b50f72c3a381055d00b2b92f6f4c9e00ed3808d96c000cf497f1154dc3625d0594161a34b8e4bbaf70f76db38a -EBUILD jitsi-2.3.4789.ebuild 2601 SHA256 3ac35f386a6f3e6c838f51a78534d26d34318f81fcd18129ae96fee7ea1f29a1 SHA512 4a3f81799a6f0e96cc0bafaafd5607a8be41f633e744889d7fab28c118db7e02bf485c803abb99e60fdb912581e866fb5b2dc1cc8a5a58a946e15a5b68f52068 WHIRLPOOL ff99dc15b57825eb7e3d8c1f2ecec4ccb18250327fcfa38ddcf591171a732d77296934c52fa096002c480c696c92ff8ae70017da5d2575077f2632bfa62f925a -MISC ChangeLog 323 SHA256 7a540a8c131052ed6785d177a3908251d61b351b1ef05ed5699bc448fc91d027 SHA512 f61f74886acd9fd64a2b2951a8f2f570a3741b5394de7978e6bb5ceaf229c4a2420ea5429966d5e9d603ec84cbbdae69bfda0931d6afb0896d40b7658f76d853 WHIRLPOOL 7dc5cbc2d44f448ea40168d643ad184c1c8b9f65ea6a13c68066c2211a486c0c7c7652be20b86a7641dbb09253b0cb9438209a37c52b18edc98f40f93d6c9fc1 +DIST jitsi-src-2.4.4997.zip 64745374 SHA256 f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825 SHA512 5c6afeffa9ff59fb07cd836b742c73a50dd23b4a954d377290fb31e9d13318db499b26c29261256809eaf801b7e0b4830128017136220b8cde8fd31cc63dcd0a WHIRLPOOL d37c3aa368775affd6e95a15a2b3d112be2fed5d9cc8d0d929da5f13935444c6d2bbe9f22a167e4c31230c70e76d33a71cf32187f3108c89aaf8ab65466d52da +EBUILD jitsi-2.4.4997.ebuild 2669 SHA256 ff1b9e964a176c0d0c3e1002ebd6a3638a2f740fd3339d675a5490517cc45e8b SHA512 d4e04ae339913d986d67321731ead58122f8bc83556a66e6511b395dc8829e6eaf84eee9b91763aa6c76e14efe831141b2ce1f668ab800a92bace5051467ced4 WHIRLPOOL cebbdea0d780fa35d57bd083248303a981b72982597674dca68090add896e81d8a7c0a44ea57d489e4d96ae553c290082c147adea6af2e542bbe29b41e643488 +MISC ChangeLog 524 SHA256 cc2c40f0be60850326a3346d52edcdc2f1157e4cc49918b5466ddb7f6bfe3d5c SHA512 1c46aeac66b4b2ad4d8783a9c799d8100a7c96c78cff82751934d687d47505ba03f34f7709f613fd38714c3b13b156562ac2b48a9e0dd59bfa482b16b1ba7f17 WHIRLPOOL 1acc0d6201c94ad193fa3a382548b47b352ead49a842d1b35fab26f8a59405f1155b1472abeb6db296ffec2f142646a3a83af2ca509383a39943428958411d40 diff --git a/net-im/jitsi/jitsi-2.0.4506.10553.ebuild b/net-im/jitsi/jitsi-2.0.4506.10553.ebuild deleted file mode 100644 index 86591be4..00000000 --- a/net-im/jitsi/jitsi-2.0.4506.10553.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit java-pkg-2 java-ant-2 eutils multilib prefix - -DESCRIPTION="An audio/video SIP VoIP phone and instant messenger written in Java" -HOMEPAGE="http://www.jitsi.org/" -SRC_URI="https://download.jitsi.org/jitsi/src/${PN}-src-${PV}.zip" -# This download comes with 30 Mb of useless jars. -# SVN access is available, but requires an account at java.net. - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" # FIXME: Should not use ALSA directly, unless USE="alsa", because e.g. PulseAudio could already use and block it. - -RDEPEND=">=virtual/jdk-1.6" -DEPEND=">=virtual/jdk-1.6 - dev-java/xalan:0 - dev-java/ant-nodeps:0" - -S="${WORKDIR}/${PN}" - -EANT_BUILD_TARGET="rebuild" - -src_install() { - - # Netbeans bundles - insinto ${EPREFIX}/usr/$(get_libdir)/jitsi/sc-bundles - doins sc-bundles/*.jar sc-bundles/os-specific/linux/*.jar - - # Other libraries - insinto ${EPREFIX}/usr/$(get_libdir)/jitsi/lib - doins lib/* lib/os-specific/linux/* - doins -r lib/bundle # Unnecessary? - - # Native libraries - insinto ${EPREFIX}/usr/$(get_libdir)/jitsi/lib/native - # WARNING: Foreign binaries! - if [[ "${ARCH}" = amd64 ]] - then doins lib/native/linux-64/* - else doins lib/native/linux/* - fi - # Make sure revdep-rebuild doesn’t complain about them. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/jitsi/lib/native\"" > 50-"${PN}" - insinto /etc/revdep-rebuild && doins "50-${PN}" - - - # Starter item / icon - insinto /usr/share/pixmaps - doins resources/install/debian/jitsi.svg - make_desktop_entry jitsi Jitsi jitsi "AudioVideo;Network;InstantMessaging;Chat;Telephony;VideoConference;Java;" - - # Generate man page from template - sed -e 's/_PACKAGE_NAME_/jitsi/g' -e 's/_APP_NAME_/Jitsi/g' \ - resources/install/debian/jitsi.1.tmpl > jitsi.1 || die - doman jitsi.1 - - # Install custom runscript - dobin "${FILESDIR}/jitsi" || die - -} diff --git a/net-im/jitsi/jitsi-2.2.4603.9615.ebuild b/net-im/jitsi/jitsi-2.2.4603.9615.ebuild deleted file mode 100644 index 4610e6d2..00000000 --- a/net-im/jitsi/jitsi-2.2.4603.9615.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit java-pkg-2 java-ant-2 eutils multilib prefix - -DESCRIPTION="An audio/video SIP VoIP phone and instant messenger written in Java" -HOMEPAGE="http://www.jitsi.org/" -SRC_URI="https://download.jitsi.org/jitsi/src/${PN}-src-${PV}.zip" -# This download comes with 30 Mb of useless jars. -# SVN access is available, but requires an account at java.net. - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" # FIXME: Should not use ALSA directly, unless USE="alsa", because e.g. PulseAudio could already use and block it. - -RDEPEND=">=virtual/jdk-1.6" -DEPEND=">=virtual/jdk-1.6 - dev-java/xalan:0 - dev-java/ant-nodeps:0 - dev-util/patchelf" - -S=${WORKDIR}/${PN}-src-${PV} - -QA_PREBUILT="usr/lib*/${PN}/lib/native/*" -EANT_BUILD_TARGET="rebuild" - -src_prepare() { - # Set RPATH for preserve-libs handling. - local x jarch - if [[ ${ARCH} == amd64 ]] ; then - jarch=amd64 - cd lib/native/linux-64 || die - else - jarch=i386 - cd lib/native/linux || die - rm *mozembed* || die - fi - local x jarch jdir - jdir=$(java-config -o || die) - for x in * ; do - # Use \x7fELF header to separate ELF executables and libraries - [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue - patchelf --set-rpath "\$ORIGIN:${jdir}/jre/lib/${jarch}:${jdir}/jre/lib/${jarch}/client:${jdir}/jre/lib/${jarch}/xawt:/usr/lib/${PN}/lib/native" "${x}" || - die "patchelf failed on ${x}" - done -} - -src_install() { - - # Netbeans bundles - insinto /usr/$(get_libdir)/${PN}/sc-bundles - doins sc-bundles/*.jar sc-bundles/os-specific/linux/*.jar - - # Other libraries - insinto /usr/$(get_libdir)/${PN}/lib - doins lib/* lib/os-specific/linux/* - doins -r lib/bundle # Unnecessary? - - # Native libraries - exeinto /usr/$(get_libdir)/${PN}/lib/native - # WARNING: Foreign binaries! - if [[ ${ARCH} == amd64 ]] ; then - doexe lib/native/linux-64/* - else - doexe lib/native/linux/* - fi - - # Make sure revdep-rebuild doesn’t complain about them. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/${PN}/lib/native\"" > 50-"${PN}" - insinto /etc/revdep-rebuild && doins "50-${PN}" - - # Starter item / icon - insinto /usr/share/pixmaps - doins resources/install/debian/${PN}.svg - make_desktop_entry ${PN} Jitsi ${PN} "AudioVideo;Network;InstantMessaging;Chat;Telephony;VideoConference;Java;" - - # Generate man page from template - sed -e 's/_PACKAGE_NAME_/jitsi/g' -e 's/_APP_NAME_/Jitsi/g' \ - resources/install/debian/jitsi.1.tmpl > "${T}/jitsi.1" || die - doman "${T}/jitsi.1" - - # Install custom runscript - exeinto /usr/bin - dobin "${FILESDIR}/jitsi" - -} diff --git a/net-im/jitsi/jitsi-2.3.4789.ebuild b/net-im/jitsi/jitsi-2.4.4997.ebuild similarity index 93% rename from net-im/jitsi/jitsi-2.3.4789.ebuild rename to net-im/jitsi/jitsi-2.4.4997.ebuild index 8f41af94..f5dbc4ff 100644 --- a/net-im/jitsi/jitsi-2.3.4789.ebuild +++ b/net-im/jitsi/jitsi-2.4.4997.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -8,7 +8,8 @@ inherit java-pkg-2 java-ant-2 eutils multilib prefix DESCRIPTION="An audio/video SIP VoIP phone and instant messenger written in Java" HOMEPAGE="http://www.jitsi.org/" -SRC_URI="https://download.jitsi.org/jitsi/nightly/src/${PN}-src-${PV}.zip" +#SRC_URI="https://download.jitsi.org/jitsi/nightly/src/${PN}-src-${PV}.zip" +SRC_URI="https://download.jitsi.org/jitsi/src/${PN}-src-${PV}.zip" # This download comes with 30 Mb of useless jars. # SVN access is available, but requires an account at java.net.