ipe: Add ipe-7.2.2. and update SRC_URIs

Also remove old ebuilds for which the the source directory does not
contain tarballs anymore.

diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
index 2aafccd27092ac3ef628eab3a8337d4d498618f9..48edf4954592c21b6e2ec2a0fc3c5fe3e7abb47c 100644 (file)
--- a/media-gfx/ipe/Manifest
+++ b/media-gfx/ipe/Manifest
@@ -1,11 +1,7 @@
 AUX ipe-outputprecision.patch 2504 SHA256 142f967987a84d2c45d0ca90d3a4b72360dd720f8d1cfa17d6f66c4500ee7e35 SHA512 13692eb5d0934147195b894f4fc378bf9f8def020cf12066025c6973097a753860f884cc8de6dc686b1bff35603874efaa814fb82838d7695f31f023109c7d83 WHIRLPOOL 8a1f6cf43c458cc47a55f42a98a055ce0c5a2c1b7e368a4d892efb44ed1c821d28489c92e26457541439019f5998b6a89f8712bdb19d0959eb9ea90fe0a5993e
 DIST ipe-7.1.10-src.tar.gz 1797408 SHA256 7fcede66270ec07e0f64634e297a6d1ab460cc434031d563736469250545934f SHA512 c3e8d1ae0f2a5803f24d035b85ba8396fc7c4134e0de80ecf72fc335d3554cc84231d9f06dc4eb2bb17edc3344e54a8f5965b285dc5a7de3307083061b9c008a WHIRLPOOL 97b7054991689223189d7b8839f302fe29baf22180a971acf08c1422790d344392c68cc4f617fd4daef395302d6b90d44cab50be5078f6400149b9f5f417da0b
-DIST ipe-7.1.3-src.tar.gz 1497624 SHA256 4b3c537aeb9720e74ee5e63d50e1ec1f760f90b3896ffb9acc8c20353f60b8e9 SHA512 eea85ed6f4bc23e746222e01f4cdfd101c9c18aeb19fcba9abff565a65614a2a5e6630ddf9f7b024cac225582a34238a22f6fc5cf7dcc3733b8281ce844ef23d WHIRLPOOL a1b46452fb3b2d5da72a411eca48a2e24331416727b4013cecebad962817d3029c63a972ae7ee743b35cfe9adc4dc3c59d04572e9b472fdf774ad67202b0b264
-DIST ipe-7.1.7-src.tar.gz 1758157 SHA256 ec670cd7f0fa521271fc54bf9b663570d82280bdbe405be6de59535fec7c00d2 SHA512 d47b984bfc5d605b4b1ee14ec94ec0abb923955c564d9a25c62f8b3bab7dd40a302ee683654ac5dce7a9903f60ca41c8621c09e88bda9d12afeaa1ad4c6d4b75 WHIRLPOOL 3ccdb72207359d1c27894b5d9d606cc4f648fa2246e098f1a6aea9b5e08f69b256cd1e00afd47987c559e2fb64c5cba2d533d5c812fa9f0dfd9c047decb4110c
-DIST ipe-7.1.8-src.tar.gz 1663641 SHA256 6a7b8dfb0a012ef9e96b62c317974d910ab6904bef29ae7636d5ac1cb26fa6ff SHA512 4e76dc0d012de9dddb3f7494494a7a1c51b6240934c4941e1b38c2578da90487f3825f59526497b52d78330498b5e2c4459dbd3ceb237fe942d0fa235ece0e38 WHIRLPOOL 3b6c56254a12e55da42c921985501d6b708b6cbf0a69754b3058ad5f45a1189cd9a42994f659576b041e9d72877192026bedc98013c896b7eb22a1b8eed78e33
 DIST ipe-7.1.9-src.tar.gz 1664418 SHA256 b61eb2674d09c12084cc5715113fa1e6083c28575c86d3b225fe6eaf250133d6 SHA512 3b8050215c2203595c31f8b604a740b347c0119c0c35cb92beab172c49ad8cad834bffe32021969efb66d3bc6867739f39888f3be034f74857295f21a4eb087f WHIRLPOOL 2792eb94b9d62e8f5b8bb1009141aff67f47fead371f7e55a73beedccb533c2b89533dcf7d092b9cb53296c2eb5118d2544b40a2dddc13530d5881ca82ff3ee9
-EBUILD ipe-7.1.10.ebuild 2406 SHA256 2e2ffdf392a521a90fb93848f6e7bb935d1a5eefd887c32c2c9f37e54addecd3 SHA512 e67b7a0931c7f68eb8d40606de795ca3a923852f27de9dcb3bf428ca74da2e3efa4ebfc65b8c2cdefcd3c006413b582d02c657951bbc2891067fe9a54701a32c WHIRLPOOL 2f68478bd49e454fde2e0645f67cfb77aa8788b712b5ed3b180a497425779e0f5c42ebcd6c66b05bd58e4d40afa4a74dcd91f074d61b63c826716b7b0318249c
-EBUILD ipe-7.1.3.ebuild 2345 SHA256 67b7284d5416e8a2df6d38d6457d050aeb363799f438a5ca58b5a8dfb62e7b54 SHA512 f4f1d8a3c213a55c8f98165e41da6682720b4e9a525f6da27437de94edef9aecde38c537257b27b21e786fd9cabbbfa039494673d73b55e2a22d7bddc5d1232b WHIRLPOOL 2a94bb4c3ecf176ef3fca2e86403a8ab514c2b4217959d34171e80bfe7aa33ec6511ed6ee648cd74e358968b9b0d1017e49ca34b5df81ab92521247bedbf9fad
-EBUILD ipe-7.1.7.ebuild 2411 SHA256 53d48124818681f23725ca5f7494834ed8b036c9ab9e2d7db0e77bc9398d61f7 SHA512 064c9025d99488609542aaef6209a852185444556e5a79065fcd15fe66e4dd7741d482bf03718e0b1551bae610c93aeb5b4fc73cfe6f74caa0cedaa99d5b13e4 WHIRLPOOL 169f2d34e38a7783e2169387fd549747b772acdde95239f51feee5be13c613f5a5fa651b4a0c81a89493eb62bdde06685db1458af56d2ebd4d18c969a37e7610
-EBUILD ipe-7.1.8.ebuild 2593 SHA256 eb1544352bd1644c9ee91c880e5397be3e5bd0c54a46ec5c301da6e9026a1d16 SHA512 fcf6b750625749fe1100df5acee76865bebefdbf1f09eed769daf545baa66b5d881208a3c75889c255ad5c2d5edf96e9fd3133729cbdeefce726092b1386936a WHIRLPOOL 5db8e3bdec92a09d2f250fe80424a1b774107663772cdf66ffc30c3de22f628fac363208ed1defac65ff002e1da02b5e3ab6f1a123480a08ec6ce565569cdf8e
-EBUILD ipe-7.1.9.ebuild 2424 SHA256 964fa47b82681da962ca1dccebaffafc7d19f5b54ba0cdba11d409a37bf90bef SHA512 2fb4c2d3d3a1c276dbb422c21eccf1eed65925c904bfa5b48e822ca07c1a149416d94318dc98ac5742e401af9ccdf9f6587cc1c4cbf441e571f940fdf47ae84c WHIRLPOOL 143b6081943a8c497db91bcaf960e07dbc0979e18aff45f750279f5389c59d7cc3cf5677c22a9ffd60e4f9cdf4fae5febd8e0b7e98c8dd45caf08e52336e3d35
+DIST ipe-7.2.2-src.tar.gz 1912583 SHA256 a70181492ac2d83546b5c88cb15da382b906d905ea3babe700bf98c822821d68 SHA512 28757e43eaf18fd40cf3fa60238fa57f311007bae4128503119ff88a48e4ff503b28683ddcdf83a14082fa3d8a2d1fff5ac5568012eab5af8a4010e37ebd196a WHIRLPOOL 1831756c0d8a5c07ea8252ac4eef81f96303509f247235011954c67b5a18dc247a00bf31118c18d2ff4c3c3fb146a9d8e294cdeeb44c91b9dd26163a047c838a
+EBUILD ipe-7.1.10.ebuild 2410 SHA256 4ca89f6091fa6cc7cf05a48a2dab42fc25c4b4af1c518c5c20d6440b36b65c50 SHA512 0ca1ba023d61cd88b484108d63ab38c521e170a0c53df0990be5a8c7f9b4212745b8874f3410c1c54747acea75cdfd4c5cc147de4c1c3cd7c5a389e502c9907f WHIRLPOOL 12d55e3c8d7d376c5ac01ccefa27995788b5bf2955746916bf4c8997cf62277c1dffbeeea31ca4412d9f0259904285504e91b8173988ef5f3fded844b107314b
+EBUILD ipe-7.1.9.ebuild 2410 SHA256 4ca89f6091fa6cc7cf05a48a2dab42fc25c4b4af1c518c5c20d6440b36b65c50 SHA512 0ca1ba023d61cd88b484108d63ab38c521e170a0c53df0990be5a8c7f9b4212745b8874f3410c1c54747acea75cdfd4c5cc147de4c1c3cd7c5a389e502c9907f WHIRLPOOL 12d55e3c8d7d376c5ac01ccefa27995788b5bf2955746916bf4c8997cf62277c1dffbeeea31ca4412d9f0259904285504e91b8173988ef5f3fded844b107314b
+EBUILD ipe-7.2.2.ebuild 2425 SHA256 75fc3ede48ebedba543029a497de0b7a7e17e1cb67df0dccedabf89a662a6d26 SHA512 227cd50dbb4efa5f041961a93779e0470cce6bf987e72d01c62e9ffc6a991dcb1fc6e7d46b47aa3eb9d84dec53c017d8221db49b77f665a69991e1695109bf5b WHIRLPOOL 745fa74c3cba16f21be0228d43a5962497fe22d8056dd369ec1095b574511d151e25dbc2e0b55cb352a974e9d86e62021dd0844b06b9975e6429574a453c248a

diff --git a/media-gfx/ipe/ipe-7.1.10.ebuild b/media-gfx/ipe/ipe-7.1.10.ebuild
index 0b5f92127ea35615a85e046cda91f9ae481fe3ce..b4962b7fa493366aef7253bbc27d1c4b25ff6b6c 100644 (file)
--- a/media-gfx/ipe/ipe-7.1.10.ebuild
+++ b/media-gfx/ipe/ipe-7.1.10.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
 HOMEPAGE="http://ipe.otfried.org"
-SRC_URI="https://dl.bintray.com/otfried/generic/ipe/7.1//${P}-src.tar.gz"
+SRC_URI="https://dl.bintray.com/otfried/generic/ipe/${PV%.*}/${P}-src.tar.gz"
 
 RESTRICT="mirror"
 

diff --git a/media-gfx/ipe/ipe-7.1.3.ebuild b/media-gfx/ipe/ipe-7.1.3.ebuild
deleted file mode 100644 (file)
index 4c3a575..0000000
--- a/media-gfx/ipe/ipe-7.1.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe7.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ipe7/${PN}/7.1.0/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="highprec"
-
-RDEPEND="app-text/texlive-core
-       dev-lang/lua
-       media-libs/freetype:2
-       x11-libs/cairo
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-COMMONDIR=/usr/share/ipe/common
-
-search_urw_fonts() {
-       # colon-separated list of paths
-       local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"
-       # according to TeX directory structure
-       local urwdir=fonts/type1/urw
-       # add colon as field separator
-       local IFS="${IFS}:" dir
-       for dir in ${texmfdist}; do
-               if [[ -d ${dir}/${urwdir} ]]; then
-                       URWFONTDIR="${dir}/${urwdir}"
-                       return 0
-               fi
-       done
-       return 1
-}
-
-pkg_setup() {
-       if search_urw_fonts; then
-               einfo "URW fonts found in ${URWFONTDIR}"
-       else
-               ewarn "Could not find directory containing URW fonts"
-               ewarn "Ipe will not function properly without them."
-       fi
-}
-
-src_prepare() {
-       sed -i \
-               -e 's/fpic/fPIC/' \
-               -e 's/moc-qt4/moc/' \
-               -e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
-               config.mak || die
-       sed -i -e 's/install -s/install/' common.mak || die
-
-       if use highprec; then
-               einfo "Adding patch for higher output precision"
-               epatch "${FILESDIR}"/${PN}-outputprecision.patch
-       fi
-}
-
-src_compile() {
-       emake \
-               CXX=$(tc-getCXX) \
-               IPEPREFIX="${EPREFIX}/usr" \
-               IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-       emake install \
-               IPEPREFIX="${EPREFIX}/usr" \
-               IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-               INSTALL_ROOT="${ED}"
-       dodoc ../{news,readme}.txt
-       doicon ipe/icons/ipe.png
-       make_desktop_entry ipe Ipe ipe
-       # Link style sheets
-       if [ -d $COMMONDIR/styles ]; then
-               einfo "Linking common style sheets from $COMMONDIR"
-               for f in $COMMONDIR/styles/*; do
-                       einfo "  Linking ${f##*/}"
-                       dosym $f usr/share/ipe/${PV}/styles/${f##*/}
-               done
-
-               elog "Style sheets from $COMMONDIR/styles have been symlinked to"
-               elog "the style sheet directory of ${P}. If you add additional"
-               elog "style sheets later to $COMMONDIR/styles you may symlink"
-               elog "them by hand to '/usr/share/ipe/${PV}/styles/'."
-       fi
-}

diff --git a/media-gfx/ipe/ipe-7.1.8.ebuild b/media-gfx/ipe/ipe-7.1.8.ebuild
deleted file mode 100644 (file)
index abe0a84..0000000
--- a/media-gfx/ipe/ipe-7.1.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe.otfried.org"
-SRC_URI="https://raw.githubusercontent.com/otfried/ipe/master/releases/7.1/${P}-src.tar.gz"
-#        https://github.com/otfried/ipe/raw/master/releases/7.1/ipe-7.1.8-src.tar.gz
-#        https://raw.githubusercontent.com/otfried/ipe/master/releases/7.1/ipe-7.1.8-src.tar.gz
-
-RESTRICT="mirror"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="highprec"
-
-RDEPEND="app-text/texlive-core
-       >=dev-lang/lua-5.2
-       media-libs/freetype:2
-       x11-libs/cairo
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-COMMONDIR=/usr/share/ipe/common
-
-search_urw_fonts() {
-       # colon-separated list of paths
-       local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"
-       # according to TeX directory structure
-       local urwdir=fonts/type1/urw
-       # add colon as field separator
-       local IFS="${IFS}:" dir
-       for dir in ${texmfdist}; do
-               if [[ -d ${dir}/${urwdir} ]]; then
-                       URWFONTDIR="${dir}/${urwdir}"
-                       return 0
-               fi
-       done
-       return 1
-}
-
-src_prepare() {
-       sed -i \
-               -e 's/fpic/fPIC/' \
-               -e 's/moc-qt4/moc/' \
-               -e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
-               config.mak || die
-       sed -i -e 's/install -s/install/' common.mak || die
-
-       if use highprec; then
-               einfo "Adding patch for higher output precision"
-               epatch "${FILESDIR}"/${PN}-outputprecision.patch
-       fi
-}
-
-pkg_setup() {
-       if search_urw_fonts; then
-               einfo "URW fonts found in ${URWFONTDIR}"
-       else
-               ewarn "Could not find directory containing URW fonts"
-               ewarn "Ipe will not function properly without them."
-       fi
-}
-
-src_compile() {
-       emake \
-               CXX=$(tc-getCXX) \
-               IPEPREFIX="${EPREFIX}/usr" \
-               IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-               LUA_PACKAGE=lua
-}
-
-src_install() {
-       emake install \
-               IPEPREFIX="${EPREFIX}/usr" \
-               IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
-               INSTALL_ROOT="${ED}"
-       dodoc ../{news,readme}.txt
-       doicon ipe/icons/ipe.png
-       make_desktop_entry ipe Ipe ipe
-       # Link style sheets
-       if [ -d $COMMONDIR/styles ]; then
-               einfo "Linking common style sheets from $COMMONDIR"
-               for f in $COMMONDIR/styles/*; do
-                       einfo "  Linking ${f##*/}"
-                       dosym $f usr/share/ipe/${PV}/styles/${f##*/}
-               done
-
-               elog "Style sheets from $COMMONDIR/styles have been symlinked to"
-               elog "the style sheet directory of ${P}. If you add additional"
-               elog "style sheets later to $COMMONDIR/styles you may symlink"
-               elog "them by hand to '/usr/share/ipe/${PV}/styles/'."
-       fi
-}

diff --git a/media-gfx/ipe/ipe-7.1.9.ebuild b/media-gfx/ipe/ipe-7.1.9.ebuild
index e4cccb9bce10f50c65e8b3e79af8969b060ac18c..b4962b7fa493366aef7253bbc27d1c4b25ff6b6c 100644 (file)
--- a/media-gfx/ipe/ipe-7.1.9.ebuild
+++ b/media-gfx/ipe/ipe-7.1.9.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
 HOMEPAGE="http://ipe.otfried.org"
-SRC_URI="https://raw.githubusercontent.com/otfried/ipe/master/releases/7.1/${P}-src.tar.gz"
+SRC_URI="https://dl.bintray.com/otfried/generic/ipe/${PV%.*}/${P}-src.tar.gz"
 
 RESTRICT="mirror"
 

diff --git a/media-gfx/ipe/ipe-7.1.7.ebuild b/media-gfx/ipe/ipe-7.2.2.ebuild
similarity index 91%
rename from media-gfx/ipe/ipe-7.1.7.ebuild
rename to media-gfx/ipe/ipe-7.2.2.ebuild
index 635b808f5d967c9a08e85eb35e59fd2556524022..52466c63b9910070665a527ba0efe70a90c1d99a 100644 (file)
--- a/media-gfx/ipe/ipe-7.1.7.ebuild
+++ b/media-gfx/ipe/ipe-7.2.2.ebuild
@@ -2,11 +2,14 @@
 # $Header: $
 
 EAPI=4
-inherit eutils toolchain-funcs qt4-r2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
 HOMEPAGE="http://ipe.otfried.org"
-SRC_URI="https://raw.githubusercontent.com/otfried/ipe/master/releases/7.1/${P}-src.tar.gz"
+SRC_URI="https://dl.bintray.com/otfried/generic/ipe/${PV%.*}/${P}-src.tar.gz"
+
+echo $SRC_URI
+
 RESTRICT="mirror"
 
 LICENSE="GPL-3"
@@ -18,8 +21,8 @@ RDEPEND="app-text/texlive-core
        >=dev-lang/lua-5.2
        media-libs/freetype:2
        x11-libs/cairo
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4"
+       dev-qt/qtcore:5
+       dev-qt/qtwidgets:5"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
@@ -45,7 +48,7 @@ search_urw_fonts() {
 src_prepare() {
        sed -i \
                -e 's/fpic/fPIC/' \
-               -e 's/moc-qt4/moc/' \
+               -e 's_moc_/usr/lib64/qt5/bin/moc_' \
                -e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \
                config.mak || die
        sed -i -e 's/install -s/install/' common.mak || die