[PATCH 1/3] eclass/enlightenment.eclass: Use https:// git URI

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/3] eclass/enlightenment.eclass: Use https:// git URI

Bertrand Jacquin-2
git:// are now prohibited on git.enlightenment.org
---
 eclass/enlightenment.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index ae7bb396590c..23b6ffcc9f54 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -46,7 +46,7 @@ E_ECONF=()
 # S           EURI_STATE
 
 E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
-E_LIVE_SERVER_DEFAULT_GIT="git://git.enlightenment.org"
+E_LIVE_SERVER_DEFAULT_GIT="https://git.enlightenment.org"
 
 E_STATE="release"
 if [[ ${PV} == *9999* ]] ; then

Reply | Threaded
Open this post in threaded view
|

[PATCH 2/3] eclass/enlightenment.eclass: Remove svn references

Bertrand Jacquin-2
SVN for E is long gone.
---
 eclass/enlightenment.eclass | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index 23b6ffcc9f54..c374af34cb1d 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -37,7 +37,7 @@ E_ECONF=()
 #
 # live         $PV has a 9999 marker
 # KEYWORDS ""
-# SRC_URI  svn/etc... up
+# SRC_URI  git/etc... up
 # S        $WORKDIR/$E_S_APPEND
 #
 # Overrides:
@@ -45,7 +45,6 @@ E_ECONF=()
 # SRC_URI     EURI_STATE
 # S           EURI_STATE
 
-E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
 E_LIVE_SERVER_DEFAULT_GIT="https://git.enlightenment.org"
 
 E_STATE="release"
@@ -58,15 +57,6 @@ if [[ ${PV} == *9999* ]] ; then
  E_S_APPEND=${EGIT_URI_APPEND}
  E_LIVE_SOURCE="git"
  inherit git-2
- else
- E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
-
- ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
- ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
- ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
- E_S_APPEND=${ESVN_URI_APPEND}
- E_LIVE_SOURCE="svn"
- inherit subversion
  fi
  E_STATE="live"
  WANT_AUTOTOOLS="yes"
@@ -126,7 +116,6 @@ esac
 enlightenment_src_unpack() {
  if [[ ${E_STATE} == "live" ]] ; then
  case ${E_LIVE_SOURCE} in
- svn) subversion_src_unpack;;
  git) git-2_src_unpack;;
  *)   die "eek!";;
  esac
@@ -147,7 +136,6 @@ enlightenment_src_prepare() {
  # autotools require README, when README.in is around, but README
  # is created later in configure step
  [[ -f README.in ]] && touch README
- export SVN_REPO_PATH=${ESVN_WC_PATH}
  eautoreconf
  fi
  epunt_cxx
@@ -178,7 +166,7 @@ enlightenment_src_compile() {
 
 enlightenment_src_install() {
  V=1 emake install DESTDIR="${D}" || die
- find "${D}" '(' -name CVS -o -name .svn -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
+ find "${D}" '(' -name CVS -o -name -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
  for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
  [[ -f ${d} ]] && dodoc ${d}
  done

Reply | Threaded
Open this post in threaded view
|

[PATCH 3/3] eclass/enlightenment.eclass: Move HOMEPAGE to https://

Bertrand Jacquin-2
In reply to this post by Bertrand Jacquin-2
Update DESCRIPTION while at there since DR17 is from the past.
---
 eclass/enlightenment.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index c374af34cb1d..8e4cc5a7a241 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -88,8 +88,8 @@ case "${EAPI:-0}" in
 esac
 EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF}
 
-DESCRIPTION="A DR17 production"
-HOMEPAGE="http://www.enlightenment.org/"
+DESCRIPTION="An Enlightenment Foundation production"
+HOMEPAGE="https://www.enlightenment.org"
 if [[ -z ${SRC_URI} ]] ; then
  case ${EURI_STATE:-${E_STATE}} in
  release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";;