diff options
| author | tampakrap <tampakrap@gentoo.org> | 2009-12-30 15:01:18 +0200 |
|---|---|---|
| committer | tampakrap <tampakrap@gentoo.org> | 2009-12-30 15:02:30 +0200 |
| commit | 895168acbc01fb302d5766326842c1c4fd5f7179 (patch) | |
| tree | af8044d0cfd5587c2bf696398d844ff2d6e7b5e9 | |
| parent | d180d7e4c1ac1f6f97942455b897a22fccda890e (diff) | |
| download | kde-895168acbc01fb302d5766326842c1c4fd5f7179.tar.gz kde-895168acbc01fb302d5766326842c1c4fd5f7179.tar.bz2 kde-895168acbc01fb302d5766326842c1c4fd5f7179.zip | |
[kde-base/kdiff3] Revert kde-meta hack and simply remove handbook use flag, as all extragear live ebuilds suffer from this
| -rw-r--r-- | kde-misc/kdiff3/Manifest | 5 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild | 13 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-9999.ebuild | 14 |
3 files changed, 9 insertions, 23 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 6fdaf734f41..e21ae05bacc 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,4 +1,3 @@ -DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f -EBUILD kdiff3-0.9.95-r1.ebuild 987 RMD160 a1e325020697417bc0e0e777f30653cd9dcf3e99 SHA1 3f2bb2a220c5fa7ba7ca188648a709d74a2d33cc SHA256 f61787c69ab0bf5fb2bd0b5cae81949cad43c055a3ec0e361f28a74dfcbead56 -EBUILD kdiff3-9999.ebuild 724 RMD160 8862b7123ea8fab1141c281a802d91225afc5501 SHA1 748efeedb495c68d0d782f4415ea590d6e047f8c SHA256 9e4ec252e5354efed3b374e8597bf96a33bfcee00b9367cfc24e8a8b05d79fda +EBUILD kdiff3-0.9.95-r1.ebuild 832 RMD160 a2a365e2f9a3acfad8ca9b3464c37104725904f4 SHA1 75cd8975d444cd26c137d9c708bda193cc5452a7 SHA256 4969677ac15329176c013f58a6b1e8bf5d18a48568ca1cebb7e4d04a9161979b +EBUILD kdiff3-9999.ebuild 584 RMD160 12f8be1537ac90f8b7158996881a84eeb2423cbc SHA1 fa9927fedd0a61fb392c3b7217896b0ec6ddf881 SHA256 7cc1593167febace9677260f12d39e514cb4eaa2ef2eea60f6f7838b7d57bd11 MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01 diff --git a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild index 649c4d9aaaa..e257b623886 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild +++ b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild @@ -7,14 +7,7 @@ EAPI="2" KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN" -if [[ ${PV} = *9999* ]]; then - KMNAME="extragear/utils" - eclass="kde4-meta" -else - eclass="kde4-base" - SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz" -fi -inherit ${eclass} +inherit kde4-base DESCRIPTION="KDE-based frontend to diff3" HOMEPAGE="http://kdiff3.sourceforge.net/" @@ -33,7 +26,7 @@ RDEPEND="${DEPEND} " src_prepare() { - ${eclass}_src_prepare + kde4-base_src_prepare # Append missing categories echo "Categories=Qt;KDE;Development;" >> src/kdiff3.desktop @@ -44,5 +37,5 @@ src_configure() { $(cmake-utils_use_with konqueror LibKonq) ) - ${eclass}_src_configure + kde4-base_src_configure } diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild index 3206eb68c5c..d4b296b9517 100644 --- a/kde-misc/kdiff3/kdiff3-9999.ebuild +++ b/kde-misc/kdiff3/kdiff3-9999.ebuild @@ -4,14 +4,8 @@ EAPI="2" -if [[ ${PV} = *9999* ]]; then - KMNAME="extragear/utils" - eclass="kde4-meta" -else - eclass="kde4-base" - SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz" -fi -inherit ${eclass} +KMNAME="extragear/utils" +inherit kde4-base DESCRIPTION="KDE-based frontend to diff3" HOMEPAGE="http://kdiff3.sourceforge.net/" @@ -19,7 +13,7 @@ HOMEPAGE="http://kdiff3.sourceforge.net/" LICENSE="GPL-2" KEYWORDS="" SLOT="4" -IUSE="debug +handbook konqueror" +IUSE="debug konqueror" DEPEND=" konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} ) @@ -34,5 +28,5 @@ src_configure() { $(cmake-utils_use_with konqueror LibKonq) ) - ${eclass}_src_configure + kde4-base_src_configure } |