diff options
| -rw-r--r-- | net-im/qutim/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/qutim/files/fix_insecure_rpath.patch | 28 | ||||
| -rw-r--r-- | net-im/qutim/files/qutim-0.2.0-gold.patch | 10 | ||||
| -rw-r--r-- | net-im/qutim/metadata.xml | 1 | ||||
| -rw-r--r-- | net-im/qutim/qutim-0.2.0-r3.ebuild | 110 | ||||
| -rw-r--r-- | net-im/qutim/qutim-0.2.0-r4.ebuild | 111 |
6 files changed, 6 insertions, 261 deletions
diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog index 1c31bea13bb5..71be68061d9c 100644 --- a/net-im/qutim/ChangeLog +++ b/net-im/qutim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/qutim # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.20 2012/05/04 06:22:14 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.21 2012/05/15 21:57:07 pesa Exp $ + + 15 May 2012; Davide Pesavento <pesa@gentoo.org> + -files/fix_insecure_rpath.patch, -files/qutim-0.2.0-gold.patch, + -qutim-0.2.0-r3.ebuild, -qutim-0.2.0-r4.ebuild, metadata.xml: + Drop all 0.2.0 versions, leaving qutim ~arch only. 04 May 2012; Jeff Horelick <jdhore@gentoo.org> qutim-0.3.1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/net-im/qutim/files/fix_insecure_rpath.patch b/net-im/qutim/files/fix_insecure_rpath.patch deleted file mode 100644 index 14c8273ecbbe..000000000000 --- a/net-im/qutim/files/fix_insecure_rpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: qutim-0.2.0/CMakeLists.txt -=================================================================== ---- qutim-0.2.0.orig/CMakeLists.txt -+++ qutim-0.2.0/CMakeLists.txt -@@ -46,6 +46,9 @@ ADD_DEFINITIONS( -DQUTIM_SVN_REVISION=${ - SET (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") - SET (CMAKE_BUILD_RPATH "${CMAKE_INSTALL_PREFIX}/lib") - SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+SET (CMAKE_SKIP_BUILD_RPATH TRUE) -+SET (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) -+ - LIST (APPEND CMAKE_MODULE_PATH "cmake") - LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - SET (QT_USE_QTNETWORK true) -Index: qutim-0.2.0/plugins/jabber/CMakeLists.txt -=================================================================== ---- qutim-0.2.0.orig/plugins/jabber/CMakeLists.txt -+++ qutim-0.2.0/plugins/jabber/CMakeLists.txt -@@ -11,6 +11,9 @@ file( GLOB_RECURSE QUTIM_UI src/*.ui )
-
- SET (JABBER_LIBS "")
- SET (JABBER_INCLUDE_DIR "")
-+SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+SET (CMAKE_SKIP_BUILD_RPATH TRUE)
-+SET (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-
- if( GLOOX_SHARED OR NOT GLOOX_PATH )
- SET( GLOOX_REQUIRED )
diff --git a/net-im/qutim/files/qutim-0.2.0-gold.patch b/net-im/qutim/files/qutim-0.2.0-gold.patch deleted file mode 100644 index 9b96f70dad11..000000000000 --- a/net-im/qutim/files/qutim-0.2.0-gold.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -446,6 +446,7 @@ - ${QT_LIBRARIES} - ${QT_QTMAIN_LIBRARY} - ${QUTIM_LIBS} -+ -lX11 - ) - - SET (module_install_dir "${CMAKE_ROOT}/Modules")
\ No newline at end of file diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml index 633e83fc94cf..f3096302fe07 100644 --- a/net-im/qutim/metadata.xml +++ b/net-im/qutim/metadata.xml @@ -21,6 +21,5 @@ <flag name="vkontakte">Enable vkontakte protocol support</flag> <flag name="webkit">Enable Adium-like WebView plugin</flag> <flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag> - <flag name="yandexnarod">Enable yandex.narod plugin</flag> </use> </pkgmetadata> diff --git a/net-im/qutim/qutim-0.2.0-r3.ebuild b/net-im/qutim/qutim-0.2.0-r3.ebuild deleted file mode 100644 index e71185493f55..000000000000 --- a/net-im/qutim/qutim-0.2.0-r3.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.2.0-r3.ebuild,v 1.7 2011/04/08 18:26:23 hwoarang Exp $ - -EAPI="2" -LANGSLONG="bg_BG cs_CZ de_DE uk_UA" -LANGS="ru" - -inherit eutils qt4-r2 cmake-utils -MY_PN="${PN/im/IM}" - -DESCRIPTION="New Qt4-based Instant Messenger (ICQ)." -HOMEPAGE="http://www.qutim.org" -LICENSE="GPL-2" -SRC_URI="http://qutim.org/uploads/src/${P}.tar.bz2" - -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug histman icq irc xmpp gnutls mrim ssl vkontakte yandexnarod" - -DEPEND="x11-libs/qt-gui:4[debug?] - x11-libs/qt-webkit:4 - || ( media-libs/phonon x11-libs/qt-phonon ) - xmpp? ( ssl? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/fix_insecure_rpath.patch -) - -src_prepare() { - qt4-r2_src_prepare - # fix translations directory - einfo "Fixing LINGUAS path" - sed -i "s/languages/\/usr\/share\/${PN}\/languages/" src/${PN}.cpp -} - -src_compile() { - # build main executable - cmake-utils_src_compile - found=0 - # build protocol support - if use xmpp; then - found=1 - cd "${S}"/plugins/jabber || die - mkdir build - cd build - cmake -C "${TMPDIR}"/gentoo_common_config.cmake \ - $(cmake-utils_use ssl OpenSSL) \ - $(cmake-utils_use gnutls GNUTLS) ../ || die - emake || die - fi - # build mrim - if use mrim; then - found=1 - cd "${S}"/plugins/mrim || die - mkdir build - cd build - cmake -C "${TMPDIR}"/gentoo_common_config.cmake ../ || die - emake || die "failed to compile mrim plugin" - fi - # Qt4 based projects so I shall use eqmake4 - cd "${S}"/plugins || die - for i in histman yandexnarod icq irc vkontakte;do - if use ${i}; then - found=1 - cd "${i}" - einfo "now building ${i}-plugin" - eqmake4 ${i}.pro - emake || die "failed to compile ${i} plugin" - cd .. - fi - done - -} - -src_install(){ - # not recommended by upstream and probably broken - #cmake-utils_src_install - dobin "${WORKDIR}/${P}_build/${PN}" || die - - cd "${S}"/plugins || die - insinto "/usr/$(get_libdir)/qutim" - [[ $found -eq 1 ]] && doins $(find . -type f -executable -iname "*.so") - doicon "${S}"/icons/${PN}_64.png || die "Failed to install icon" - make_desktop_entry ${PN} ${MY_PN} ${PN}_64 \ - "Network;InstantMessaging;Qt" || die "make_desktop_entry failed" - - #install linguas - for X in ${LANGSLONG}; do - for Z in ${LINGUAS}; do - if [[ ${X%_*} == ${Z} ]]; then - einfo "Installing ${Z} translation files" - insinto /usr/share/${PN}/languages/${X}/ - doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation" - fi - done - done - for X in ${LANGS}; do - for Z in ${LINGUAS}; do - if [[ ${X} == ${Z} ]]; then - einfo "Installing ${Z} translation files" - insinto /usr/share/${PN}/languages/${X}/ - doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation" - fi - done - done - -} diff --git a/net-im/qutim/qutim-0.2.0-r4.ebuild b/net-im/qutim/qutim-0.2.0-r4.ebuild deleted file mode 100644 index 1a57052e3870..000000000000 --- a/net-im/qutim/qutim-0.2.0-r4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.2.0-r4.ebuild,v 1.1 2012/03/16 11:58:25 johu Exp $ - -EAPI="2" -LANGSLONG="bg_BG cs_CZ de_DE uk_UA" -LANGS="ru" - -inherit eutils qt4-r2 cmake-utils -MY_PN="${PN/im/IM}" - -DESCRIPTION="New Qt4-based Instant Messenger (ICQ)." -HOMEPAGE="http://www.qutim.org" -LICENSE="GPL-2" -SRC_URI="http://qutim.org/uploads/src/${P}.tar.bz2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug histman icq irc xmpp gnutls mrim ssl vkontakte yandexnarod" - -DEPEND="x11-libs/qt-gui:4[debug?] - x11-libs/qt-webkit:4 - || ( media-libs/phonon x11-libs/qt-phonon ) - xmpp? ( ssl? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/fix_insecure_rpath.patch - "${FILESDIR}"/${P}-gold.patch -) - -src_prepare() { - qt4-r2_src_prepare - # fix translations directory - einfo "Fixing LINGUAS path" - sed -i "s/languages/\/usr\/share\/${PN}\/languages/" src/${PN}.cpp -} - -src_compile() { - # build main executable - cmake-utils_src_compile - found=0 - # build protocol support - if use xmpp; then - found=1 - cd "${S}"/plugins/jabber || die - mkdir build - cd build - cmake -C "${TMPDIR}"/gentoo_common_config.cmake \ - $(cmake-utils_use ssl OpenSSL) \ - $(cmake-utils_use gnutls GNUTLS) ../ || die - emake || die - fi - # build mrim - if use mrim; then - found=1 - cd "${S}"/plugins/mrim || die - mkdir build - cd build - cmake -C "${TMPDIR}"/gentoo_common_config.cmake ../ || die - emake || die "failed to compile mrim plugin" - fi - # Qt4 based projects so I shall use eqmake4 - cd "${S}"/plugins || die - for i in histman yandexnarod icq irc vkontakte;do - if use ${i}; then - found=1 - cd "${i}" - einfo "now building ${i}-plugin" - eqmake4 ${i}.pro - emake || die "failed to compile ${i} plugin" - cd .. - fi - done - -} - -src_install(){ - # not recommended by upstream and probably broken - #cmake-utils_src_install - dobin "${WORKDIR}/${P}_build/${PN}" || die - - cd "${S}"/plugins || die - insinto "/usr/$(get_libdir)/qutim" - [[ $found -eq 1 ]] && doins $(find . -type f -executable -iname "*.so") - doicon "${S}"/icons/${PN}_64.png || die "Failed to install icon" - make_desktop_entry ${PN} ${MY_PN} ${PN}_64 \ - "Network;InstantMessaging;Qt" || die "make_desktop_entry failed" - - #install linguas - for X in ${LANGSLONG}; do - for Z in ${LINGUAS}; do - if [[ ${X%_*} == ${Z} ]]; then - einfo "Installing ${Z} translation files" - insinto /usr/share/${PN}/languages/${X}/ - doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation" - fi - done - done - for X in ${LANGS}; do - for Z in ${LINGUAS}; do - if [[ ${X} == ${Z} ]]; then - einfo "Installing ${Z} translation files" - insinto /usr/share/${PN}/languages/${X}/ - doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation" - fi - done - done - -} |