diff options
author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-04-18 12:33:29 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-04-18 12:33:29 +0300 |
commit | 20fa21589807b4a98d36745b76ef33182951b600 (patch) | |
tree | 1244b9d4a03ae01b7901af07c992ebda4908736e | |
parent | b4eacb45cbff08221f85a3217f6318bb6f5ccf67 (diff) |
cleanup
-rw-r--r-- | net-im/spectrum/files/spectrum2.patch | 44 | ||||
-rw-r--r-- | net-im/swiften/files/swiften-libdir.patch | 30 | ||||
-rw-r--r-- | net-im/swiften/swiften-2.9999.ebuild | 88 |
3 files changed, 0 insertions, 162 deletions
diff --git a/net-im/spectrum/files/spectrum2.patch b/net-im/spectrum/files/spectrum2.patch deleted file mode 100644 index 859c15f..0000000 --- a/net-im/spectrum/files/spectrum2.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur libtransport/cmake_modules/SwiftenConfig.cmake libtransport2/cmake_modules/SwiftenConfig.cmake ---- libtransport/cmake_modules/SwiftenConfig.cmake 2015-01-05 00:56:53.394900918 +0300 -+++ libtransport2/cmake_modules/SwiftenConfig.cmake 2015-01-05 00:49:12.000000000 +0300 -@@ -1,38 +1,7 @@ - FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften HINTS ../lib) - FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften/Swiften.h" PATH_SUFFIXES libSwiften Swiften HINTS ../include) - --if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) -- find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable" HINTS ../bin) -- set( SWIFTEN_CFLAGS "" ) -- if (SWIFTEN_CONFIG_EXECUTABLE) -- execute_process( -- COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --libs -- OUTPUT_VARIABLE SWIFTEN_LIB) -- string(REGEX REPLACE "[\r\n]" " " SWIFTEN_LIB ${SWIFTEN_LIB}) -- string(REGEX REPLACE " +$" "" SWIFTEN_LIB ${SWIFTEN_LIB}) -- string(REGEX REPLACE " " ";" SWIFTEN_LIB ${SWIFTEN_LIB}) -- set(SWIFTEN_LIBRARY "") -- foreach(f ${SWIFTEN_LIB}) -- STRING(SUBSTRING ${f} 0 2 f_out) -- STRING(COMPARE EQUAL ${f_out} "/L" IS_PATH) -- if(${IS_PATH}) -- string(REGEX REPLACE "/LIBPATH:" "" f_replaced "${f}") -- message("Added link directory: ${f_replaced}") -- link_directories(${f_replaced}) -- else() -- list(APPEND SWIFTEN_LIBRARY ${f}) -- endif() -- endforeach(f) -- set( SWIFTEN_FOUND 1 ) -- else() -- message( STATUS "Could NOT find swiften-config" ) -- endif() -+set(SWIFTEN_LIBRARY "Swiften") - -- if (SWIFTEN_FOUND) -- set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR} ) -- message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}") -- endif() -+set( SWIFTEN_FOUND 1 ) - --else( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) -- message( STATUS "Could NOT find libSwiften" ) --endif( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) diff --git a/net-im/swiften/files/swiften-libdir.patch b/net-im/swiften/files/swiften-libdir.patch deleted file mode 100644 index 0dc2af0..0000000 --- a/net-im/swiften/files/swiften-libdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Swiften/SConscript b/Swiften/SConscript -index 379576d..7096a9c 100644 ---- a/Swiften/SConscript -+++ b/Swiften/SConscript -@@ -425,8 +425,11 @@ if env["SCONS_STAGE"] == "build" : - - # Install swiften - if swiften_env.get("SWIFTEN_INSTALLDIR", "") : -- swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib"), swiften_lib) -+ libdir = os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib") -+ if swiften_env.get("SWIFTEN_LIBDIR", "") : -+ libdir = swiften_env["SWIFTEN_LIBDIR"] -+ swiften_env.Install(libdir, swiften_lib) - for alias in myenv["SWIFTEN_LIBRARY_ALIASES"] : -- myenv.Command(myenv.File(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "lib", alias)), [env.Value(swiften_lib[0].name), swiften_lib[0]], symlink) -+ myenv.Command(myenv.File(os.path.join(libdir, alias)), [env.Value(swiften_lib[0].name), swiften_lib[0]], symlink) - for include in swiften_includes : - swiften_env.Install(os.path.join(swiften_env["SWIFTEN_INSTALLDIR"], "include", os.path.dirname(include)), "#/" + include) - ---- a/BuildTools/SCons/SConscript.boot -+++ b/BuildTools/SCons/SConscript.boot -@@ -220,7 +220,7 @@ env["TEST_CREATE_LIBRARIES"] = "create_test_libraries" in ARGUMENTS - - # Packaging - env["DIST"] = "dist" in ARGUMENTS or env.GetOption("clean") --for path in ["SWIFT_INSTALLDIR", "SWIFTEN_INSTALLDIR"] : -+for path in ["SWIFT_INSTALLDIR", "SWIFTEN_INSTALLDIR", "SWIFTEN_LIBDIR"] : - if ARGUMENTS.get(path, "") : - if os.path.isabs(ARGUMENTS[path]) : - env[path] = Dir(ARGUMENTS[path]).abspath diff --git a/net-im/swiften/swiften-2.9999.ebuild b/net-im/swiften/swiften-2.9999.ebuild deleted file mode 100644 index 5a3c2da..0000000 --- a/net-im/swiften/swiften-2.9999.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -SCONS_MIN_VERSION="1.2" -LANGS=" ca de es fr hu nl pl ru se sk" - -[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS="" - -inherit eutils scons-utils toolchain-funcs ${VCS_ECLASS} - -DESCRIPTION="Just a perfect C++ XMPP library" -HOMEPAGE="http://swift.im/" -MY_P="swift-${PV}" -S="${WORKDIR}/${MY_P}" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://swift.im/swift" - EGIT_BRANCH="swift-2.x" -else - SRC_URI="http://swift.im/downloads/releases/${MY_P}/${MY_P}.tar.gz" -fi - -LICENSE="GPL-3" -SLOT="0" -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" -else - KEYWORDS="" -fi -IUSE="avahi debug doc test" -IUSE+="${LANGS// / linguas_}" - -RDEPEND=" - avahi? ( net-dns/avahi ) - >=dev-libs/boost-1.42 - >=dev-libs/openssl-0.9.8g - >=net-dns/libidn-1.10 - dev-libs/libxml2 - >=dev-libs/expat-2.0.1 - sys-libs/zlib -" -DEPEND="${RDEPEND} - doc? ( - >=app-text/docbook-xsl-stylesheets-1.75 - >=app-text/docbook-xml-dtd-4.5 - dev-libs/libxslt - ) -" - -src_prepare() { - pushd 3rdParty || die - # TODO CppUnit, Lua - rm -rf Boost CAres DocBook Expat LCov LibIDN OpenSSL SCons SQLite ZLib || die - popd || die - #rm -rf Swiften/Examples || die - epatch "${FILESDIR}"/*.patch - rm -rf Swiften/Examples #fucked shit -} - -src_compile() { - scons_vars=( - cc="$(tc-getCC)" - cxx="$(tc-getCXX)" - ccflags="${CFLAGS}" - linkflags="${LDFLAGS}" - allow_warnings=1 - $(use_scons debug) - openssl="${EPREFIX}/usr" - docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" - docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5" - swiften_dll=1 - Swiften - ) - - escons "${scons_vars[@]}" -} - -src_test() { - escons "${scons_vars[@]}" test="unit" QA -} - -src_install() { - escons "${scons_vars[@]}" SWIFTEN_INSTALLDIR="${ED}/usr" \ - SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)" "${ED}/usr" - - use doc && dohtml "Documentation/SwiftenDevelopersGuide/Swiften Developers Guide.html" -} |