diff --git a/app-arch/upx-ucl/Manifest b/app-arch/upx-ucl/Manifest deleted file mode 100644 index 05a89ac46..000000000 --- a/app-arch/upx-ucl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST upx-lzma-sdk-3.95.tar.gz 109697 BLAKE2B 437e4bb557f51206696bb4eedb5af63f0f9a4ba2b5627f2ccaa278716d194ed4ae2cfb9837d75aa1f0c813255361001a6f5ddf16e7c4785a9a49baf5a16c8b2b SHA512 e7a42b0e1a47fda6ebf037aef947d9bf69308c4fdce9637c54abf7e5bff865c7beb813f79b28a40495d42da408173a0c42a572d5a1b06a8b7c6faab7d5874140 -DIST upx-ucl-3.95.tar.gz 1663470 BLAKE2B 58d223a2f56a8b981d4bddb5f6588d21b9b5ae0df396de1f67af1b6206b9098c88be19f9f6476ef682c62c020570368f0175283b0fc427ca6420ce41210bfe2c SHA512 9676c4373ad7f5ef7b2ba36134ec60cd0c53ac989d559ef4b201be93167a984a9e0ba6343dbfdd029e8b29897fd9591b6f7c08f41ee681ff48f852a8ed2465da diff --git a/app-arch/upx-ucl/metadata.xml b/app-arch/upx-ucl/metadata.xml deleted file mode 100644 index 4fa8ff351..000000000 --- a/app-arch/upx-ucl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - proxy-maint@gentoo.org - Proxy Maintainers - - diff --git a/app-arch/upx-ucl/upx-ucl-3.95.ebuild b/app-arch/upx-ucl/upx-ucl-3.96.ebuild similarity index 87% rename from app-arch/upx-ucl/upx-ucl-3.95.ebuild rename to app-arch/upx-ucl/upx-ucl-3.96.ebuild index 132bab9d7..0665a7787 100644 --- a/app-arch/upx-ucl/upx-ucl-3.95.ebuild +++ b/app-arch/upx-ucl/upx-ucl-3.96.ebuild @@ -9,7 +9,7 @@ LZMA_VER=${PV} MY_P="${P/-ucl}" DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)" -HOMEPAGE="http://upx.sourceforge.net/" +HOMEPAGE="https://upx.github.io/" SRC_URI="https://github.com/upx/upx/archive/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/upx/upx-lzma-sdk/archive/v${LZMA_VER}.tar.gz -> upx-lzma-sdk-${LZMA_VER}.tar.gz" @@ -18,7 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="zlib" -RDEPEND=">=dev-libs/ucl-1.02 +RDEPEND=">=dev-libs/ucl-1.03 + zlib? ( sys-libs/zlib ) !app-arch/upx !app-arch/upx-bin" DEPEND="${RDEPEND} @@ -39,11 +40,10 @@ src_configure() { src_compile() { tc-export CXX emake UPX_LZMADIR="${WORKDIR}/upx-lzma-sdk-${LZMA_VER}" UPX_LZMA_VERSION=${LZMA_VER} all - emake all } src_install() { newbin src/upx.out upx - dodoc BUGS NEWS PROJECTS README* THANKS doc/*.txt + dodoc BUGS NEWS PROJECTS README* THANKS doc/*.txt doc/upx.html doman doc/upx.1 } diff --git a/dev-util/retdec/Manifest b/dev-util/retdec/Manifest index 893100869..d19962b9e 100644 --- a/dev-util/retdec/Manifest +++ b/dev-util/retdec/Manifest @@ -1,2 +1 @@ -DIST retdec-3.2.tar.gz 2886288 BLAKE2B 66a800e3aa25dae958c50a8f7a84d3effa9e21693da69ffb219bf3badb125c2e19e1a71e4e7117ddcf13856f5ebff9b5a74c4550e7c0896897a9e6f4aaab4d3b SHA512 774271d5d3a25070a5618563ff980a512bb91ff2d5febd8eceb6f29890ea145e9639a5b55f1170ec78e7c62fc1368cd542fd70c5b6f3c49fb3ae98d9a2380005 DIST retdec-3.3.tar.gz 8489178 BLAKE2B b9c7f2b20141dc923a87aea17eaa4bfa75bfe6f3b22209ce78b43944b3036cde14d6293b1492fa2d51c7a17cf9343312680ef9d72024f1e26e3e6071c47a46bd SHA512 9516028891d327c61f6541e45c72186169ed2447dd674a7444a4bddccbafdb59541759c75eba92d090eb7c6c1ae5321ba765e916d2229af7a09b020d601ded52 diff --git a/dev-util/retdec/retdec-3.2-r1.ebuild b/dev-util/retdec/retdec-3.2-r1.ebuild deleted file mode 100644 index 040506ccc..000000000 --- a/dev-util/retdec/retdec-3.2-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="RetDec is a retargetable machine-code decompiler based on LLVM." -HOMEPAGE="https://github.com/avast-tl/retdec" -SRC_URI="https://github.com/avast-tl/retdec/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc external" - -RDEPEND="|| ( app-arch/upx-ucl app-arch/upx-bin ) - sys-devel/bc - sys-devel/bison - sys-devel/flex - dev-ruby/pkg-config - sys-apps/coreutils - sys-libs/zlib - sys-libs/ncurses:*[tinfo] - dev-libs/libdwarf - - doc? ( media-gfx/graphviz - app-doc/doxygen )" -DEPEND="${RDEPEND} - dev-util/cmake" - -# dev-libs/jsoncpp -# dev-libs/rapidjson -# dev-libs/tinyxml2 - -CMAKE_REMOVE_MODULES_LIST="FindJsoncpp FindRapidjson FindTynyxml2 FindLibdwarf FindOpenssl" - -src_prepare(){ - #https://github.com/avast-tl/retdec/issues/357 - - #compile with system dwarf - sed "s|libdwarf|dwarf elf z|g" -i ./src/cpdetect/CMakeLists.txt - sed "s|libdwarf|dwarf elf z|g" -i ./src/dwarfparser/CMakeLists.txt - - #FIXME: do not download files here - #use system files -# sed "s|add_subdirectory(jsoncpp)|#add_subdirectory(jsoncpp)|g" -i ./deps/CMakeLists.txt -#/data/notmpfs/portage/dev-util/retdec-3.1/work/retdec-3.1/include/retdec/config/base.h:16:10: fatal error: json/json.h: No such file or directory -# #include -# sed "s|add_subdirectory(rapidjson)|#add_subdirectory(rapidjson)|g" -i ./deps/CMakeLists.txt -# sed "s|add_subdirectory(tinyxml2)|#add_subdirectory(tinyxml2)|g" -i ./deps/CMakeLists.txt - sed "s|add_subdirectory(libdwarf)|#add_subdirectory(libdwarf)|g" -i ./deps/CMakeLists.txt - - sed "s|get_install_path(sys.argv)| \"${D}\" + get_install_path(sys.argv)|g" -i ./cmake/install-share.py - sed "s|install_dir = os.path.join|install_dir = \"${D}\" + os.path.join|g" -i ./support/yara_patterns/tools/compile-yara.py - - if use !external; then - sed '/install-external.cmake/d' -i ./CMakeLists.txt - fi - - cmake-utils_src_prepare - eapply_user -} - -src_configure() { - -#-Dbtrfs-snapshot=$(usex btrfs) -#-DRETDEC_DOC=ON -#-DRETDEC_TESTS=ON -#-DCMAKE_BUILD_TYPE=Debug - - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -} diff --git a/dev-util/retdec/retdec-3.3.ebuild b/dev-util/retdec/retdec-3.3-r1.ebuild similarity index 98% rename from dev-util/retdec/retdec-3.3.ebuild rename to dev-util/retdec/retdec-3.3-r1.ebuild index f7dc1c6a9..39ef2b5e9 100644 --- a/dev-util/retdec/retdec-3.3.ebuild +++ b/dev-util/retdec/retdec-3.3-r1.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc system-libs" -RDEPEND="|| ( app-arch/upx-ucl app-arch/upx-bin ) +RDEPEND="|| ( app-arch/upx app-arch/upx-bin ) sys-devel/bc sys-devel/bison sys-devel/flex diff --git a/profiles/pentoo/base/package.accept_keywords/app-arch b/profiles/pentoo/base/package.accept_keywords/app-arch index a2839238e..ce4262f4f 100644 --- a/profiles/pentoo/base/package.accept_keywords/app-arch +++ b/profiles/pentoo/base/package.accept_keywords/app-arch @@ -1,6 +1,3 @@ -#Pentoo -app-arch/upx-ucl - #Gentoo =app-arch/upx-3* =app-arch/upx-bin-3*